From b0ed69f05c575da40a9f925a324af215d3e4de84 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 23 Oct 2016 20:43:14 +0200 Subject: [PATCH] Optimize android_keyboard_port_input_pressed --- input/drivers/android_input.c | 2 +- input/drivers_keyboard/keyboard_event_android.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/input/drivers/android_input.c b/input/drivers/android_input.c index 48da3a8405..a85f3d15e6 100644 --- a/input/drivers/android_input.c +++ b/input/drivers/android_input.c @@ -1162,7 +1162,7 @@ static bool android_input_key_pressed(void *data, int key) settings_t *settings = config_get_ptr(); int port = 0; - if(android_keyboard_port_input_pressed(settings->input.binds[0],key)) + if(settings->input.binds[0][key].valid && android_keyboard_port_input_pressed(settings->input.binds[0],key)) return true; if (settings->input.all_users_control_menu) diff --git a/input/drivers_keyboard/keyboard_event_android.c b/input/drivers_keyboard/keyboard_event_android.c index 47b1208f2c..a039adf601 100644 --- a/input/drivers_keyboard/keyboard_event_android.c +++ b/input/drivers_keyboard/keyboard_event_android.c @@ -32,7 +32,7 @@ bool android_keyboard_port_input_pressed(const struct retro_keybind *binds, unsi { const struct retro_keybind *bind = &binds[id]; unsigned bit = input_keymaps_translate_rk_to_keysym(binds[id].key); - return bind->valid && BIT_GET(android_key_state[ANDROID_KEYBOARD_PORT], bit); + return BIT_GET(android_key_state[ANDROID_KEYBOARD_PORT], bit); } return false; }