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

Fix segfault when launching content with cores that do not have serialized savestate support when rewind and cheevos hardcore mode are enabled (#13607)

Browse Source
This commit is contained in:
jdgleaver 2022-02-07 22:52:25 +00:00 committed by GitHub
parent 5d3ebd0ece
commit ab8e8359a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cheevos/cheevos_menu.c
View File

@ -401,7 +401,7 @@ void rcheevos_menu_populate_hardcore_pause_submenu(void* data)
{
menu_entries_append_enum(info->list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ACHIEVEMENT_PAUSE_CANCEL),
msg_hash_to_str(MENU_ENUM_SUBLABEL_ACHIEVEMENT_PAUSE_CANCEL),
msg_hash_to_str(MENU_ENUM_LABEL_ACHIEVEMENT_PAUSE_CANCEL),
MENU_ENUM_LABEL_ACHIEVEMENT_PAUSE_CANCEL,
MENU_SETTING_ACTION_CLOSE, 0, 0);
menu_entries_append_enum(info->list,
@ -414,7 +414,7 @@ void rcheevos_menu_populate_hardcore_pause_submenu(void* data)
{
menu_entries_append_enum(info->list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ACHIEVEMENT_RESUME_CANCEL),
msg_hash_to_str(MENU_ENUM_SUBLABEL_ACHIEVEMENT_RESUME_CANCEL),
msg_hash_to_str(MENU_ENUM_LABEL_ACHIEVEMENT_RESUME_CANCEL),
MENU_ENUM_LABEL_ACHIEVEMENT_RESUME_CANCEL,
MENU_SETTING_ACTION_CLOSE, 0, 0);
menu_entries_append_enum(info->list,
@ -451,13 +451,13 @@ void rcheevos_menu_populate(void* data)
if (rcheevos_locals->hardcore_active)
menu_entries_append_enum(info->list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ACHIEVEMENT_PAUSE),
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ACHIEVEMENT_PAUSE_MENU),
msg_hash_to_str(MENU_ENUM_LABEL_ACHIEVEMENT_PAUSE_MENU),
MENU_ENUM_LABEL_ACHIEVEMENT_PAUSE_MENU,
MENU_SETTING_ACTION_PAUSE_ACHIEVEMENTS, 0, 0);
else
menu_entries_append_enum(info->list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ACHIEVEMENT_RESUME),
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ACHIEVEMENT_PAUSE_MENU),
msg_hash_to_str(MENU_ENUM_LABEL_ACHIEVEMENT_PAUSE_MENU),
MENU_ENUM_LABEL_ACHIEVEMENT_PAUSE_MENU,
MENU_SETTING_ACTION_RESUME_ACHIEVEMENTS, 0, 0);
}

20
intl/msg_hash_lbl.h
View File

@ -23,8 +23,24 @@ MSG_HASH(
"retro_achievements"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_ACHIEVEMENT_PAUSE_MENU,
"toggle_cheevos_hardcore"
MENU_ENUM_LABEL_ACHIEVEMENT_PAUSE_MENU,
"achievement_pause_menu"
)
MSG_HASH(
MENU_ENUM_LABEL_ACHIEVEMENT_PAUSE_CANCEL,
"achievement_pause_cancel"
)
MSG_HASH(
MENU_ENUM_LABEL_ACHIEVEMENT_RESUME_CANCEL,
"achievement_resume_cancel"
)
MSG_HASH(
MENU_ENUM_LABEL_ACHIEVEMENT_PAUSE,
"achievement_pause"
)
MSG_HASH(
MENU_ENUM_LABEL_ACHIEVEMENT_RESUME,
"achievement_resume"
)
MSG_HASH(
MENU_ENUM_LABEL_ACCOUNTS_TWITCH,

2
menu/cbs/menu_cbs_deferred_push.c
View File

@ -852,7 +852,7 @@ static int menu_cbs_init_bind_deferred_push_compare_label(
#ifdef HAVE_VIDEO_LAYOUT
{MENU_ENUM_LABEL_VIDEO_LAYOUT_PATH, deferred_push_video_layout_path},
#endif
{MENU_ENUM_LABEL_VALUE_ACHIEVEMENT_PAUSE_MENU, deferred_push_achievement_pause_menu},
{MENU_ENUM_LABEL_ACHIEVEMENT_PAUSE_MENU, deferred_push_achievement_pause_menu},
{MENU_ENUM_LABEL_ACHIEVEMENT_LIST, deferred_push_achievement_list},
{MENU_ENUM_LABEL_CORE_COUNTERS, deferred_push_core_counters},
{MENU_ENUM_LABEL_FRONTEND_COUNTERS, deferred_push_frontend_counters},

2
menu/cbs/menu_cbs_title.c
View File

@ -1177,7 +1177,7 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs,
{MENU_ENUM_LABEL_DEFERRED_PLAYLIST_MANAGER_LIST,
action_get_playlist_manager_list},
#ifdef HAVE_CHEEVOS
{MENU_ENUM_LABEL_VALUE_ACHIEVEMENT_PAUSE_MENU,
{MENU_ENUM_LABEL_ACHIEVEMENT_PAUSE_MENU,
action_get_title_achievement_pause_menu},
{MENU_ENUM_LABEL_ACHIEVEMENT_LIST,
action_get_title_cheevos_list},

11
state_manager.c
View File

@ -578,11 +578,20 @@ void state_manager_event_init(
struct state_manager_rewind_state *rewind_st,
unsigned rewind_buffer_size)
{
void *state = NULL;
core_info_t *core_info = NULL;
void *state = NULL;
if (!rewind_st || rewind_st->state)
return;
/* We cannot initialise the rewind buffer
* unless the core info struct for the current
* core has been initialised (i.e. without this,
* the savestate support level for the current
* core is unknown) */
if (!core_info_get_current_core(&core_info) || !core_info)
return;
if (!core_info_current_supports_rewind())
{
RARCH_ERR("%s\n", msg_hash_to_str(MSG_REWIND_UNSUPPORTED));