mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-31 15:32:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12489 from Jamiras/cheevos_challenge_indicators

Browse Source 
(cheevos) address travis errors
This commit is contained in:
Autechre 2021-06-05 17:37:06 +02:00 committed by GitHub
commit f57fcd4048
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gfx/widgets/gfx_widget_leaderboard_display.c
View File

@ -18,6 +18,8 @@
#include "../gfx_display.h" #include "../gfx_display.h"
#include "../gfx_widgets.h" #include "../gfx_widgets.h"
#include "../cheevos/cheevos.h"
#ifdef HAVE_THREADS #ifdef HAVE_THREADS
#define SLOCK_LOCK(x) slock_lock(x) #define SLOCK_LOCK(x) slock_lock(x)
#define SLOCK_UNLOCK(x) slock_unlock(x) #define SLOCK_UNLOCK(x) slock_unlock(x)
@ -196,7 +198,7 @@ static void gfx_widget_leaderboard_display_frame(void* data, void* userdata)
void gfx_widgets_set_leaderboard_display(unsigned id, const char* value) void gfx_widgets_set_leaderboard_display(unsigned id, const char* value)
{ {
int i; unsigned i;
gfx_widget_leaderboard_display_state_t *state = &p_w_leaderboard_display_st; gfx_widget_leaderboard_display_state_t *state = &p_w_leaderboard_display_st;
SLOCK_LOCK(state->array_lock); SLOCK_LOCK(state->array_lock);
@ -243,13 +245,13 @@ void gfx_widgets_set_leaderboard_display(unsigned id, const char* value)
void gfx_widgets_set_challenge_display(unsigned id, const char* badge) void gfx_widgets_set_challenge_display(unsigned id, const char* badge)
{ {
int i; unsigned i;
gfx_widget_leaderboard_display_state_t* state = &p_w_leaderboard_display_st; gfx_widget_leaderboard_display_state_t* state = &p_w_leaderboard_display_st;
/* important - this must be done outside the lock because it has the potential to need to /* important - this must be done outside the lock because it has the potential to need to
* lock the video thread, which may be waiting for the popup queue lock to render popups */ * lock the video thread, which may be waiting for the popup queue lock to render popups */
uintptr_t badge_id = badge ? rcheevos_get_badge_texture(badge, 0) : NULL; uintptr_t badge_id = badge ? rcheevos_get_badge_texture(badge, 0) : 0;
uintptr_t old_badge_id = NULL; uintptr_t old_badge_id = 0;
SLOCK_LOCK(state->array_lock); SLOCK_LOCK(state->array_lock);