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

Move core_shutdown_initiated to runloop.c and turn it into

Browse Source 
static variable
This commit is contained in:
twinaphex 2015-11-30 15:43:49 +01:00
parent 4e0a4150b5
commit 86de67b3d7
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dynamic.c
View File

@ -768,7 +768,7 @@ bool rarch_environment_cb(unsigned cmd, void *data)
case RETRO_ENVIRONMENT_SHUTDOWN: case RETRO_ENVIRONMENT_SHUTDOWN:
RARCH_LOG("Environ SHUTDOWN.\n"); RARCH_LOG("Environ SHUTDOWN.\n");
system->shutdown = true; system->shutdown = true;
global->core_shutdown_initiated = true; rarch_main_ctl(RARCH_MAIN_CTL_SET_CORE_SHUTDOWN, NULL);
break; break;
case RETRO_ENVIRONMENT_SET_PERFORMANCE_LEVEL: case RETRO_ENVIRONMENT_SET_PERFORMANCE_LEVEL:

10
runloop.c
View File

@ -57,6 +57,7 @@
static struct global g_extern; static struct global g_extern;
static bool main_core_shutdown_initiated;
static bool main_is_idle; static bool main_is_idle;
static bool main_is_paused; static bool main_is_paused;
static bool main_is_slowmotion; static bool main_is_slowmotion;
@ -792,6 +793,9 @@ bool rarch_main_ctl(enum rarch_main_ctl_state state, void *data)
rarch_ctl(RARCH_ACTION_STATE_LOAD_CONTENT, NULL); rarch_ctl(RARCH_ACTION_STATE_LOAD_CONTENT, NULL);
} }
break; break;
case RARCH_MAIN_CTL_SET_CORE_SHUTDOWN:
main_core_shutdown_initiated = true;
break;
default: default:
return false; return false;
} }
@ -943,14 +947,14 @@ static INLINE int rarch_main_iterate_time_to_exit(event_cmd_state_t *cmd)
* instead of exiting RetroArch completely. * instead of exiting RetroArch completely.
* Aborts core shutdown if invoked. * Aborts core shutdown if invoked.
*/ */
if (global->core_shutdown_initiated if (main_core_shutdown_initiated
&& settings->load_dummy_on_core_shutdown) && settings->load_dummy_on_core_shutdown)
{ {
if (!rarch_main_ctl(RARCH_MAIN_CTL_PREPARE_DUMMY, NULL)) if (!rarch_main_ctl(RARCH_MAIN_CTL_PREPARE_DUMMY, NULL))
return -1; return -1;
system->shutdown = false; system->shutdown = false;
global->core_shutdown_initiated = false; main_core_shutdown_initiated = false;
return 0; return 0;
} }

2
runloop.h
View File

@ -55,6 +55,7 @@ enum rarch_main_ctl_state
RARCH_MAIN_CTL_CLEAR_STATE, RARCH_MAIN_CTL_CLEAR_STATE,
RARCH_MAIN_CTL_STATE_FREE, RARCH_MAIN_CTL_STATE_FREE,
RARCH_MAIN_CTL_GLOBAL_FREE, RARCH_MAIN_CTL_GLOBAL_FREE,
RARCH_MAIN_CTL_SET_CORE_SHUTDOWN,
/* Checks for state changes in this frame. */ /* Checks for state changes in this frame. */
RARCH_MAIN_CTL_CHECK_STATE, RARCH_MAIN_CTL_CHECK_STATE,
RARCH_MAIN_CTL_CHECK_MOVIE, RARCH_MAIN_CTL_CHECK_MOVIE,
@ -122,7 +123,6 @@ typedef struct global
{ {
bool perfcnt_enable; bool perfcnt_enable;
bool force_fullscreen; bool force_fullscreen;
bool core_shutdown_initiated;
struct string_list *temporary_content; struct string_list *temporary_content;