From c33b7676c6566f7d7b528a49baae6f6bf5d51240 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 18 May 2015 20:53:23 +0200 Subject: [PATCH] Use menu_displaylist_push_list --- menu/menu_input.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/menu/menu_input.c b/menu/menu_input.c index c288137480..2cbd91181c 100644 --- a/menu/menu_input.c +++ b/menu/menu_input.c @@ -370,6 +370,7 @@ static bool menu_input_custom_bind_keyboard_cb(void *data, unsigned code) static int menu_input_set_bind_mode_common(rarch_setting_t *setting, enum menu_input_bind_mode type) { + menu_displaylist_info_t info = {0}; struct retro_keybind *keybind = NULL; settings_t *settings = config_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr(); @@ -392,21 +393,26 @@ static int menu_input_set_bind_mode_common(rarch_setting_t *setting, menu->binds.last = setting->bind_type; menu->binds.target = keybind; menu->binds.user = setting->index_offset; - menu_list_push( menu->menu_list->menu_stack, - "", "custom_bind", - MENU_SETTINGS_CUSTOM_BIND_KEYBOARD, - nav->selection_ptr); + + info.list = menu->menu_list->menu_stack; + info.type = MENU_SETTINGS_CUSTOM_BIND_KEYBOARD; + info.directory_ptr = nav->selection_ptr; + strlcpy(info.label, "custom_bind", sizeof(info.label)); + + menu_displaylist_push_list(&info, DISPLAYLIST_SELECT); break; case MENU_INPUT_BIND_ALL: menu->binds.target = &settings->input.binds [setting->index_offset][0]; menu->binds.begin = MENU_SETTINGS_BIND_BEGIN; menu->binds.last = MENU_SETTINGS_BIND_LAST; - menu_list_push( menu->menu_list->menu_stack, - "", - "custom_bind_all", - MENU_SETTINGS_CUSTOM_BIND_KEYBOARD, - nav->selection_ptr); + + info.list = menu->menu_list->menu_stack; + info.type = MENU_SETTINGS_CUSTOM_BIND_KEYBOARD; + info.directory_ptr = nav->selection_ptr; + strlcpy(info.label, "custom_bind_all", sizeof(info.label)); + + menu_displaylist_push_list(&info, DISPLAYLIST_SELECT); break; } return 0;