From 9b13894438d1125a6522291fc923ff6a5de9dbef Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 10 Jun 2017 12:48:09 +0200 Subject: [PATCH] Slightly rewrite input_state for android input driver --- input/drivers/android_input.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/input/drivers/android_input.c b/input/drivers/android_input.c index e61b3905f3..a7a67fc8e0 100644 --- a/input/drivers/android_input.c +++ b/input/drivers/android_input.c @@ -1341,14 +1341,17 @@ static int16_t android_input_state(void *data, const struct retro_keybind **binds, unsigned port, unsigned device, unsigned idx, unsigned id) { + int16_t ret = 0; android_input_t *android = (android_input_t*)data; switch (device) { case RETRO_DEVICE_JOYPAD: - return input_joypad_pressed(android->joypad, joypad_info, - port, binds[port], id) || - android_keyboard_port_input_pressed(binds[port],id); + ret = input_joypad_pressed(android->joypad, joypad_info, + port, binds[port], id); + if (!ret) + ret = android_keyboard_port_input_pressed(binds[port],id); + return ret; case RETRO_DEVICE_ANALOG: if (binds[port]) return input_joypad_analog(android->joypad, joypad_info,