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

Simplify check_input_driver_block_hotkey

This commit is contained in:
twinaphex 2016-12-01 02:23:10 +01:00
parent 51650e6414
commit e6eeb8e559
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
input/input_driver.c
View File

@ -539,12 +539,12 @@ static bool check_input_driver_block_hotkey(bool enable_hotkey)
bool kb_mapping_is_blocked = current_input->keyboard_mapping_is_blocked && bool kb_mapping_is_blocked = current_input->keyboard_mapping_is_blocked &&
current_input->keyboard_mapping_is_blocked(current_input_data); current_input->keyboard_mapping_is_blocked(current_input_data);
input_driver_block_hotkey = false;
/* Don't block the check to RARCH_ENABLE_HOTKEY /* Don't block the check to RARCH_ENABLE_HOTKEY
* unless we're really supposed to. */ * unless we're really supposed to. */
if (kb_mapping_is_blocked) if (kb_mapping_is_blocked)
input_driver_block_hotkey = true; input_driver_block_hotkey = true;
else
input_driver_block_hotkey = false;
/* If we haven't bound anything to this, /* If we haven't bound anything to this,
* always allow hotkeys. */ * always allow hotkeys. */
@ -556,10 +556,8 @@ static bool check_input_driver_block_hotkey(bool enable_hotkey)
|| (autoconf_bind->joykey != NO_BTN) || (autoconf_bind->joykey != NO_BTN)
|| (autoconf_bind->joyaxis != AXIS_NONE); || (autoconf_bind->joyaxis != AXIS_NONE);
if (kb_mapping_is_blocked || (use_hotkey_enable && !enable_hotkey)) if (use_hotkey_enable && !enable_hotkey)
input_driver_block_hotkey = true; input_driver_block_hotkey = true;
else
input_driver_block_hotkey = false;
/* If we hold ENABLE_HOTKEY button, block all libretro input to allow /* If we hold ENABLE_HOTKEY button, block all libretro input to allow
* hotkeys to be bound to same keys as RetroPad. */ * hotkeys to be bound to same keys as RetroPad. */