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

Merge pull request #1311 from gizmo98/patch-3 

check_block_hotkey(): Add RARCH_ENABLE_HOTKEY check of first autoconf_bi...
This commit is contained in:
Twinaphex 2015-01-03 23:00:05 +01:00
parent 24ebb87844 5fdb9004d5
commit 96224575f5
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
runloop.c
View File

@ -536,6 +536,8 @@ static void check_block_hotkey(bool enable_hotkey)
bool use_hotkey_enable;
static const struct retro_keybind *bind =
&g_settings.input.binds[0][RARCH_ENABLE_HOTKEY];
static const struct retro_keybind *autoconf_bind =
&g_settings.input.autoconf_binds[0][RARCH_ENABLE_HOTKEY];
/* Don't block the check to RARCH_ENABLE_HOTKEY
* unless we're really supposed to. */
@ -544,7 +546,10 @@ static void check_block_hotkey(bool enable_hotkey)
// If we haven't bound anything to this, always allow hotkeys.
use_hotkey_enable = bind->key != RETROK_UNKNOWN ||
bind->joykey != NO_BTN ||
bind->joyaxis != AXIS_NONE;
bind->joyaxis != AXIS_NONE ||
autoconf_bind->key != RETROK_UNKNOWN ||
autoconf_bind->joykey != NO_BTN ||
autoconf_bind->joyaxis != AXIS_NONE;;
driver.block_hotkey = driver.block_input ||
(use_hotkey_enable && !enable_hotkey);