From 72671279c719b19729401a869dcf366ce6b8dd35 Mon Sep 17 00:00:00 2001 From: Themaister Date: Sun, 13 Apr 2014 20:12:45 +0200 Subject: [PATCH] Correctly check for RGUI_ACTION_OK. --- frontend/menu/menu_settings.c | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/frontend/menu/menu_settings.c b/frontend/menu/menu_settings.c index 3dc8a0f30a..25378e8e3a 100644 --- a/frontend/menu/menu_settings.c +++ b/frontend/menu/menu_settings.c @@ -996,23 +996,26 @@ int menu_set_settings(void *data, unsigned setting, unsigned action) rgui->bind_mode_keyboard = !rgui->bind_mode_keyboard; break; case RGUI_SETTINGS_CUSTOM_BIND_ALL: - if (rgui->bind_mode_keyboard) + if (action == RGUI_ACTION_OK) { - rgui->binds.target = &g_settings.input.binds[port][0]; - rgui->binds.begin = RGUI_SETTINGS_BIND_BEGIN; - rgui->binds.last = RGUI_SETTINGS_BIND_LAST; - file_list_push(rgui->menu_stack, "", RGUI_SETTINGS_CUSTOM_BIND_KEYBOARD, rgui->selection_ptr); - rgui->binds.timeout_end = rarch_get_time_usec() + RGUI_KEYBOARD_BIND_TIMEOUT_SECONDS * 1000000; - input_keyboard_wait_keys(rgui, menu_custom_bind_keyboard_cb); - } - else - { - rgui->binds.target = &g_settings.input.binds[port][0]; - rgui->binds.begin = RGUI_SETTINGS_BIND_BEGIN; - rgui->binds.last = RGUI_SETTINGS_BIND_LAST; - file_list_push(rgui->menu_stack, "", RGUI_SETTINGS_CUSTOM_BIND, rgui->selection_ptr); - menu_poll_bind_get_rested_axes(&rgui->binds); - menu_poll_bind_state(&rgui->binds); + if (rgui->bind_mode_keyboard) + { + rgui->binds.target = &g_settings.input.binds[port][0]; + rgui->binds.begin = RGUI_SETTINGS_BIND_BEGIN; + rgui->binds.last = RGUI_SETTINGS_BIND_LAST; + file_list_push(rgui->menu_stack, "", RGUI_SETTINGS_CUSTOM_BIND_KEYBOARD, rgui->selection_ptr); + rgui->binds.timeout_end = rarch_get_time_usec() + RGUI_KEYBOARD_BIND_TIMEOUT_SECONDS * 1000000; + input_keyboard_wait_keys(rgui, menu_custom_bind_keyboard_cb); + } + else + { + rgui->binds.target = &g_settings.input.binds[port][0]; + rgui->binds.begin = RGUI_SETTINGS_BIND_BEGIN; + rgui->binds.last = RGUI_SETTINGS_BIND_LAST; + file_list_push(rgui->menu_stack, "", RGUI_SETTINGS_CUSTOM_BIND, rgui->selection_ptr); + menu_poll_bind_get_rested_axes(&rgui->binds); + menu_poll_bind_state(&rgui->binds); + } } break; case RGUI_SETTINGS_CUSTOM_BIND_DEFAULT_ALL: