ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify runloop_iterate_time_to_exit

This commit is contained in:
twinaphex 2016-12-05 07:11:38 +01:00
parent c98ef48860
commit d3834bb795
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
runloop.c
View File

@ -760,7 +760,6 @@ bool runloop_ctl(enum runloop_ctl_state state, void *data)
*/ */
static INLINE int runloop_iterate_time_to_exit(bool quit_key_pressed) static INLINE int runloop_iterate_time_to_exit(bool quit_key_pressed)
{ {
settings_t *settings = config_get_ptr();
bool time_to_exit = runloop_shutdown_initiated; bool time_to_exit = runloop_shutdown_initiated;
time_to_exit = time_to_exit || quit_key_pressed; time_to_exit = time_to_exit || quit_key_pressed;
time_to_exit = time_to_exit || !video_driver_is_alive(); time_to_exit = time_to_exit || !video_driver_is_alive();
@ -776,8 +775,11 @@ static INLINE int runloop_iterate_time_to_exit(bool quit_key_pressed)
if (runloop_exec) if (runloop_exec)
runloop_exec = false; runloop_exec = false;
if (runloop_core_shutdown_initiated && if (runloop_core_shutdown_initiated)
settings && settings->load_dummy_on_core_shutdown) {
settings_t *settings = config_get_ptr();
if (settings->load_dummy_on_core_shutdown)
{ {
content_ctx_info_t content_info = {0}; content_ctx_info_t content_info = {0};
if (!task_push_content_load_default( if (!task_push_content_load_default(
@ -795,6 +797,7 @@ static INLINE int runloop_iterate_time_to_exit(bool quit_key_pressed)
return 1; return 1;
} }
}
/* Quits out of RetroArch main loop. */ /* Quits out of RetroArch main loop. */
return -1; return -1;