Merge pull request #8680 from jdgleaver/state-no-resume

For platforms without HAVE_THREADS, don't automatically resume content when saving/loading states
This commit is contained in:
Twinaphex 2019-05-03 18:03:56 +02:00 committed by GitHub
commit 792031c45e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -3255,7 +3255,12 @@ static int action_ok_load_state(const char *path,
{
if (generic_action_ok_command(CMD_EVENT_LOAD_STATE) == -1)
return menu_cbs_exit();
/* TODO/FIXME: Make this a user-configurable option */
#if defined(HAVE_THREADS)
return generic_action_ok_command(CMD_EVENT_RESUME);
#else
return 0;
#endif
}
static int action_ok_save_state(const char *path,
@ -3263,7 +3268,12 @@ static int action_ok_save_state(const char *path,
{
if (generic_action_ok_command(CMD_EVENT_SAVE_STATE) == -1)
return menu_cbs_exit();
/* TODO/FIXME: Make this a user-configurable option */
#if defined(HAVE_THREADS)
return generic_action_ok_command(CMD_EVENT_RESUME);
#else
return 0;
#endif
}
static int action_ok_cheevos_toggle_hardcore_mode(const char *path,