From 914acd3956d153cc43009b432f66c7e142cdefd4 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 18 Jun 2017 20:02:50 +0200 Subject: [PATCH] Revert "Get rid of some warnings" This reverts commit 3d45ba29d8f18f0f3c4360231511bbcf8933cef8. --- input/input_driver.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/input/input_driver.c b/input/input_driver.c index 20944706e1..68e2f4a9a1 100644 --- a/input/input_driver.c +++ b/input/input_driver.c @@ -677,9 +677,6 @@ uint64_t input_menu_keys_pressed(void *data, uint64_t last_input) input_driver_block_libretro_input = false; input_driver_block_hotkey = false; - joypad_info.joy_idx = 0; - joypad_info.auto_binds = NULL; - joypad_info.joy_idx = input_driver_axis_threshold; if (current_input->keyboard_mapping_is_blocked && current_input->keyboard_mapping_is_blocked(current_input_data)) @@ -704,6 +701,7 @@ uint64_t input_menu_keys_pressed(void *data, uint64_t last_input) joypad_info.joy_idx = settings->uints.input_joypad_map[port]; joypad_info.auto_binds = input_autoconf_binds[joypad_info.joy_idx]; + joypad_info.axis_threshold = input_driver_axis_threshold; if (htkey->valid && current_input->input_state(current_input_data, joypad_info, @@ -744,6 +742,7 @@ uint64_t input_menu_keys_pressed(void *data, uint64_t last_input) joypad_info.joy_idx = settings->uints.input_joypad_map[port]; joypad_info.auto_binds = input_autoconf_binds[joypad_info.joy_idx]; + joypad_info.axis_threshold = input_driver_axis_threshold; joykey = (input_config_binds[port][i].joykey != NO_BTN) ? input_config_binds[port][i].joykey : joypad_info.auto_binds[i].joykey;