From 422ce9396c700c8b9f5ba161b3fc5f4aad647b88 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 18 Dec 2017 06:14:48 +0100 Subject: [PATCH] Cleanup - input_key_pressed --- input/input_driver.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/input/input_driver.c b/input/input_driver.c index bae3ebb4bd..70d519d946 100644 --- a/input/input_driver.c +++ b/input/input_driver.c @@ -1078,6 +1078,8 @@ void input_keys_pressed(void *data, retro_bits_t* p_new_state) for (i = 0; i < RARCH_BIND_LIST_END; i++) { + bool bit_pressed = false; + if ( ((!input_driver_block_libretro_input && ((i < RARCH_FIRST_META_KEY))) || !input_driver_block_hotkey) && @@ -1085,19 +1087,15 @@ void input_keys_pressed(void *data, retro_bits_t* p_new_state) joypad_info, &binds, 0, RETRO_DEVICE_JOYPAD, 0, i) ) - { - BIT256_SET_PTR(p_new_state, i); - return; - } + bit_pressed = true; - if (input_keys_pressed_iterate(i, p_new_state)) + if (bit_pressed || input_keys_pressed_iterate(i, p_new_state)) { BIT256_SET_PTR(p_new_state, i); } } } - void *input_driver_get_data(void) { return current_input_data;