From 4502b58ab3983b449184e681c3923c1a781c91ea Mon Sep 17 00:00:00 2001 From: jdgleaver Date: Fri, 3 May 2019 16:32:48 +0100 Subject: [PATCH 1/2] For platforms without HAVE_THREADS, don't automatically resume content when saving/loading states --- menu/cbs/menu_cbs_ok.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index 954247b691..b5e34280e7 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -3255,7 +3255,11 @@ static int action_ok_load_state(const char *path, { if (generic_action_ok_command(CMD_EVENT_LOAD_STATE) == -1) return menu_cbs_exit(); +#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 +3267,11 @@ static int action_ok_save_state(const char *path, { if (generic_action_ok_command(CMD_EVENT_SAVE_STATE) == -1) return menu_cbs_exit(); +#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, From 6bb5dea1d4de4ee403d87445be0770d8589280b4 Mon Sep 17 00:00:00 2001 From: jdgleaver Date: Fri, 3 May 2019 17:03:00 +0100 Subject: [PATCH 2/2] Add TODO/FIXME comment --- menu/cbs/menu_cbs_ok.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index b5e34280e7..07fda5728b 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -3255,6 +3255,7 @@ 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 @@ -3267,6 +3268,7 @@ 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