From 569dfdfbb44812ea8cc4467b9944595e1bf134fa Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 21 Jun 2019 07:09:07 +0200 Subject: [PATCH] Move this outside of keys_pressed functions --- retroarch.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/retroarch.c b/retroarch.c index 917b2231cd..8779f63b58 100644 --- a/retroarch.c +++ b/retroarch.c @@ -3761,13 +3761,6 @@ static void input_keys_pressed(input_bits_t *p_new_state) joypad_info.auto_binds = input_autoconf_binds[joypad_info.joy_idx]; joypad_info.axis_threshold = input_driver_axis_threshold; - input_driver_block_libretro_input = false; - input_driver_block_hotkey = false; - - if ( current_input->keyboard_mapping_is_blocked - && current_input->keyboard_mapping_is_blocked(current_input_data)) - input_driver_block_hotkey = true; - if (check_input_driver_block_hotkey(binds_norm, binds_auto)) { const struct retro_keybind *enable_hotkey = @@ -3832,13 +3825,6 @@ static void input_menu_keys_pressed(input_bits_t *p_new_state) joypad_info.joy_idx = 0; joypad_info.auto_binds = NULL; - input_driver_block_libretro_input = false; - input_driver_block_hotkey = false; - - if (current_input->keyboard_mapping_is_blocked - && current_input->keyboard_mapping_is_blocked(current_input_data)) - input_driver_block_hotkey = true; - for (i = 0; i < max_users; i++) { struct retro_keybind *auto_binds = input_autoconf_binds[i]; @@ -15821,6 +15807,14 @@ static enum runloop_state runloop_check_state( BIT256_CLEAR_ALL_PTR(¤t_bits); + input_driver_block_libretro_input = false; + input_driver_block_hotkey = false; + + if ( current_input->keyboard_mapping_is_blocked + && current_input->keyboard_mapping_is_blocked(current_input_data)) + input_driver_block_hotkey = true; + + #ifdef HAVE_MENU if (menu_is_alive && !(settings->bools.menu_unified_controls && !menu_input_dialog_get_display_kb())) input_menu_keys_pressed(¤t_bits);