mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-18 05:43:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rewrite quit key handling

Browse Source
This commit is contained in:
twinaphex 2017-05-21 13:50:59 +02:00
parent 24c7bcb196
commit d08b785f9d
1 changed files with 33 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
retroarch.c
View File

@ -2314,35 +2314,47 @@ static enum runloop_state runloop_check_state(
} }
#endif #endif
if (time_to_exit(runloop_cmd_press(trigger_input, RARCH_QUIT_KEY))) /* Check quit key */
{ {
if (runloop_exec) static bool old_quit_key = false;
runloop_exec = false; bool quit_key = runloop_cmd_press(
current_input, RARCH_QUIT_KEY);
bool trig_quit_key = quit_key && !old_quit_key;
if (runloop_core_shutdown_initiated && settings->bools.load_dummy_on_core_shutdown) old_quit_key = quit_key;
if (time_to_exit(trig_quit_key))
{ {
content_ctx_info_t content_info; if (runloop_exec)
runloop_exec = false;
content_info.argc = 0; if (runloop_core_shutdown_initiated && settings->bools.load_dummy_on_core_shutdown)
content_info.argv = NULL;
content_info.args = NULL;
content_info.environ_get = NULL;
if (!task_push_start_dummy_core(&content_info))
{ {
content_ctx_info_t content_info;
content_info.argc = 0;
content_info.argv = NULL;
content_info.args = NULL;
content_info.environ_get = NULL;
if (!task_push_start_dummy_core(&content_info))
{
old_quit_key = quit_key;
retroarch_main_quit();
return RUNLOOP_STATE_QUIT;
}
/* Loads dummy core instead of exiting RetroArch completely.
* Aborts core shutdown if invoked. */
runloop_shutdown_initiated = false;
runloop_core_shutdown_initiated = false;
}
else
{
old_quit_key = quit_key;
retroarch_main_quit(); retroarch_main_quit();
return RUNLOOP_STATE_QUIT; return RUNLOOP_STATE_QUIT;
} }
/* Loads dummy core instead of exiting RetroArch completely.
* Aborts core shutdown if invoked. */
runloop_shutdown_initiated = false;
runloop_core_shutdown_initiated = false;
}
else
{
retroarch_main_quit();
return RUNLOOP_STATE_QUIT;
} }
} }