mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-01 04:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6860 from meleu/patch-22

Browse Source 
fix crash when scrolling cheevos list. fixes #6732
This commit is contained in:
Twinaphex 2018-06-04 16:31:08 +02:00 committed by GitHub
commit 7bfe9e409a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cheevos/cheevos.c
View File

@ -2041,7 +2041,7 @@ void cheevos_reset_game(void)
void cheevos_populate_menu(void *data) void cheevos_populate_menu(void *data)
{ {
#ifdef HAVE_MENU #ifdef HAVE_MENU
unsigned i; unsigned i = 0;
unsigned items_found = 0; unsigned items_found = 0;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
menu_displaylist_info_t *info = (menu_displaylist_info_t*)data; menu_displaylist_info_t *info = (menu_displaylist_info_t*)data;
@ -2072,34 +2072,32 @@ void cheevos_populate_menu(void *data)
{ {
if (!(cheevo->active & CHEEVOS_ACTIVE_HARDCORE)) if (!(cheevo->active & CHEEVOS_ACTIVE_HARDCORE))
{ {
menu_entries_append_enum(info->list, cheevo->title, menu_entries_append_enum(info->list, cheevo->title,
cheevo->description, cheevo->description,
MENU_ENUM_LABEL_CHEEVOS_UNLOCKED_ENTRY_HARDCORE, MENU_ENUM_LABEL_CHEEVOS_UNLOCKED_ENTRY_HARDCORE,
MENU_SETTINGS_CHEEVOS_START + i, 0, 0); MENU_SETTINGS_CHEEVOS_START + i, 0, 0);
items_found++; set_badge_info(&badges_ctx, i, cheevo->badge,
set_badge_info(&badges_ctx, i, cheevo->badge,
(cheevo->active & CHEEVOS_ACTIVE_HARDCORE)); (cheevo->active & CHEEVOS_ACTIVE_HARDCORE));
} }
else if (!(cheevo->active & CHEEVOS_ACTIVE_SOFTCORE)) else if (!(cheevo->active & CHEEVOS_ACTIVE_SOFTCORE))
{ {
menu_entries_append_enum(info->list, cheevo->title, menu_entries_append_enum(info->list, cheevo->title,
cheevo->description, cheevo->description,
MENU_ENUM_LABEL_CHEEVOS_UNLOCKED_ENTRY, MENU_ENUM_LABEL_CHEEVOS_UNLOCKED_ENTRY,
MENU_SETTINGS_CHEEVOS_START + i, 0, 0); MENU_SETTINGS_CHEEVOS_START + i, 0, 0);
items_found++; set_badge_info(&badges_ctx, i, cheevo->badge,
set_badge_info(&badges_ctx, i, cheevo->badge,
(cheevo->active & CHEEVOS_ACTIVE_SOFTCORE)); (cheevo->active & CHEEVOS_ACTIVE_SOFTCORE));
} }
else else
{ {
menu_entries_append_enum(info->list, cheevo->title, menu_entries_append_enum(info->list, cheevo->title,
cheevo->description, cheevo->description,
MENU_ENUM_LABEL_CHEEVOS_LOCKED_ENTRY, MENU_ENUM_LABEL_CHEEVOS_LOCKED_ENTRY,
MENU_SETTINGS_CHEEVOS_START + i, 0, 0); MENU_SETTINGS_CHEEVOS_START + i, 0, 0);
items_found++; set_badge_info(&badges_ctx, i, cheevo->badge,
set_badge_info(&badges_ctx, i, cheevo->badge,
(cheevo->active & CHEEVOS_ACTIVE_SOFTCORE)); (cheevo->active & CHEEVOS_ACTIVE_SOFTCORE));
} }
items_found++;
} }
} }
@ -2109,7 +2107,7 @@ void cheevos_populate_menu(void *data)
{ {
end = cheevo + cheevos_locals.unofficial.count; end = cheevo + cheevos_locals.unofficial.count;
for (i = cheevos_locals.core.count; cheevo < end; i++, cheevo++) for (i = items_found; cheevo < end; i++, cheevo++)
{ {
if (!(cheevo->active & CHEEVOS_ACTIVE_HARDCORE)) if (!(cheevo->active & CHEEVOS_ACTIVE_HARDCORE))
{ {
@ -2117,7 +2115,6 @@ void cheevos_populate_menu(void *data)
cheevo->description, cheevo->description,
MENU_ENUM_LABEL_CHEEVOS_UNLOCKED_ENTRY_HARDCORE, MENU_ENUM_LABEL_CHEEVOS_UNLOCKED_ENTRY_HARDCORE,
MENU_SETTINGS_CHEEVOS_START + i, 0, 0); MENU_SETTINGS_CHEEVOS_START + i, 0, 0);
items_found++;
set_badge_info(&badges_ctx, i, cheevo->badge, set_badge_info(&badges_ctx, i, cheevo->badge,
(cheevo->active & CHEEVOS_ACTIVE_HARDCORE)); (cheevo->active & CHEEVOS_ACTIVE_HARDCORE));
} }
@ -2127,7 +2124,6 @@ void cheevos_populate_menu(void *data)
cheevo->description, cheevo->description,
MENU_ENUM_LABEL_CHEEVOS_UNLOCKED_ENTRY, MENU_ENUM_LABEL_CHEEVOS_UNLOCKED_ENTRY,
MENU_SETTINGS_CHEEVOS_START + i, 0, 0); MENU_SETTINGS_CHEEVOS_START + i, 0, 0);
items_found++;
set_badge_info(&badges_ctx, i, cheevo->badge, set_badge_info(&badges_ctx, i, cheevo->badge,
(cheevo->active & CHEEVOS_ACTIVE_SOFTCORE)); (cheevo->active & CHEEVOS_ACTIVE_SOFTCORE));
} }
@ -2137,10 +2133,10 @@ void cheevos_populate_menu(void *data)
cheevo->description, cheevo->description,
MENU_ENUM_LABEL_CHEEVOS_LOCKED_ENTRY, MENU_ENUM_LABEL_CHEEVOS_LOCKED_ENTRY,
MENU_SETTINGS_CHEEVOS_START + i, 0, 0); MENU_SETTINGS_CHEEVOS_START + i, 0, 0);
items_found++;
set_badge_info(&badges_ctx, i, cheevo->badge, set_badge_info(&badges_ctx, i, cheevo->badge,
(cheevo->active & CHEEVOS_ACTIVE_SOFTCORE)); (cheevo->active & CHEEVOS_ACTIVE_SOFTCORE));
} }
items_found++;
} }
} }
@ -2170,7 +2166,7 @@ bool cheevos_get_description(cheevos_ctx_desc_t *desc)
if (desc->idx >= cheevos_locals.core.count) if (desc->idx >= cheevos_locals.core.count)
{ {
cheevos = cheevos_locals.unofficial.cheevos; cheevos = cheevos_locals.unofficial.cheevos;
desc->idx -= cheevos_locals.unofficial.count; desc->idx -= cheevos_locals.core.count;
} }
if (!string_is_empty(cheevos[desc->idx].description)) if (!string_is_empty(cheevos[desc->idx].description))