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

fix hotkey firing when binding quit key

Browse Source
This commit is contained in:
Brad Parker 2016-10-29 23:25:47 -04:00
parent 25eaee066c
commit 2e654658d8
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
runloop.c
View File

@ -860,14 +860,12 @@ static enum runloop_state runloop_check_state(
if (!focused) if (!focused)
return RUNLOOP_STATE_SLEEP; return RUNLOOP_STATE_SLEEP;
if (action == MENU_ACTION_QUIT) if (action == MENU_ACTION_QUIT && !menu_driver_is_binding_state())
return RUNLOOP_STATE_QUIT; return RUNLOOP_STATE_QUIT;
} }
if (menu_driver_is_binding_state()) if (menu_driver_is_binding_state())
{
trigger_input = 0; trigger_input = 0;
}
} }
#endif #endif
@ -914,7 +912,7 @@ static enum runloop_state runloop_check_state(
#endif #endif
if (runloop_iterate_time_to_exit( if (runloop_iterate_time_to_exit(
runloop_cmd_press(current_input, RARCH_QUIT_KEY)) != 1) runloop_cmd_press(trigger_input, RARCH_QUIT_KEY)) != 1)
return RUNLOOP_STATE_QUIT; return RUNLOOP_STATE_QUIT;
if (runloop_idle) if (runloop_idle)