diff --git a/menu/menu_entries.c b/menu/menu_entries.c index dad4cba6af..27e0703805 100644 --- a/menu/menu_entries.c +++ b/menu/menu_entries.c @@ -524,7 +524,7 @@ bool menu_entries_init(menu_handle_t *menu) menu->list_settings = setting_new(SL_FLAG_ALL); - menu_list_push_stack(menu->menu_list, "", "Main Menu", MENU_SETTINGS, 0); + menu_list_push(menu->menu_list->menu_stack, "", "Main Menu", MENU_SETTINGS, 0); menu_navigation_clear(&menu->navigation, true); menu_entries_push_list(menu, menu->menu_list->selection_buf, "", "Main Menu", 0, SL_FLAG_MAIN_MENU); diff --git a/menu/menu_entries_cbs_iterate.c b/menu/menu_entries_cbs_iterate.c index 0fa49f4ffe..fdd4522881 100644 --- a/menu/menu_entries_cbs_iterate.c +++ b/menu/menu_entries_cbs_iterate.c @@ -352,7 +352,7 @@ static int action_iterate_menu_viewport(const char *label, unsigned action) if (!strcmp(label, "custom_viewport_2")) { - menu_list_push_stack(menu_list, "", "", + menu_list_push(menu_list->menu_stack, "", "", MENU_SETTINGS_CUSTOM_VIEWPORT, menu->navigation.selection_ptr); } @@ -363,7 +363,7 @@ static int action_iterate_menu_viewport(const char *label, unsigned action) if (type == MENU_SETTINGS_CUSTOM_VIEWPORT && !settings->video.scale_integer) - menu_list_push_stack(menu_list, "", + menu_list_push(menu_list->menu_stack, "", "custom_viewport_2", 0, menu->navigation.selection_ptr); break; @@ -623,7 +623,7 @@ static int action_iterate_main(const char *label, unsigned action) { menu_list_t *menu_list = menu_list_get_ptr(); - menu_list_push_stack(menu_list, "", "help", 0, 0); + menu_list_push(menu_list->menu_stack, "", "help", 0, 0); menu->push_start_screen = false; } diff --git a/menu/menu_entries_cbs_ok.c b/menu/menu_entries_cbs_ok.c index 333fb6f289..7e3e89d9af 100644 --- a/menu/menu_entries_cbs_ok.c +++ b/menu/menu_entries_cbs_ok.c @@ -728,12 +728,8 @@ static int action_ok_compressed_archive_push(const char *path, if (!menu) return -1; - menu_list_push_stack( - menu->menu_list, - path, - "load_open_zip", - 0, - idx); + menu_list_push(menu->menu_list->menu_stack, + path, "load_open_zip", 0, idx); return 0; } @@ -964,8 +960,8 @@ static int action_ok_custom_viewport(const char *path, return -1; - menu_list_push_stack( - menu->menu_list, + menu_list_push( + menu->menu_list->menu_stack, "", "custom_viewport_1", MENU_SETTINGS_CUSTOM_VIEWPORT, @@ -1179,8 +1175,8 @@ static int action_ok_help(const char *path, if (!menu) return -1; - menu_list_push_stack( - menu->menu_list, + menu_list_push( + menu->menu_list->menu_stack, "", "help", 0, diff --git a/menu/menu_entries_cbs_select.c b/menu/menu_entries_cbs_select.c index 1cc303a2df..4d3b0a41d6 100644 --- a/menu/menu_entries_cbs_select.c +++ b/menu/menu_entries_cbs_select.c @@ -23,7 +23,7 @@ static int action_select_default(unsigned type, const char *label, menu_handle_t *menu = menu_driver_get_ptr(); if (!menu) return 0; - menu_list_push_stack(menu->menu_list, "", "info_screen", + menu_list_push(menu->menu_list->menu_stack, "", "info_screen", 0, menu->navigation.selection_ptr); return 0; } diff --git a/menu/menu_input.c b/menu/menu_input.c index b16fb462a3..2bb226f64a 100644 --- a/menu/menu_input.c +++ b/menu/menu_input.c @@ -392,9 +392,8 @@ int menu_input_set_keyboard_bind_mode(void *data, menu->binds.last = setting->bind_type; menu->binds.target = keybind; menu->binds.user = setting->index_offset; - menu_list_push_stack( menu->menu_list, - "", - "custom_bind", + menu_list_push( menu->menu_list->menu_stack, + "", "custom_bind", MENU_SETTINGS_CUSTOM_BIND_KEYBOARD, nav->selection_ptr); break; @@ -403,7 +402,7 @@ int menu_input_set_keyboard_bind_mode(void *data, [setting->index_offset][0]; menu->binds.begin = MENU_SETTINGS_BIND_BEGIN; menu->binds.last = MENU_SETTINGS_BIND_LAST; - menu_list_push_stack( menu->menu_list, + menu_list_push( menu->menu_list->menu_stack, "", "custom_bind_all", MENU_SETTINGS_CUSTOM_BIND_KEYBOARD, @@ -446,7 +445,7 @@ int menu_input_set_input_device_bind_mode(void *data, menu->binds.last = setting->bind_type; menu->binds.target = keybind; menu->binds.user = setting->index_offset; - menu_list_push_stack( menu->menu_list, + menu_list_push( menu->menu_list->menu_stack, "", "custom_bind", MENU_SETTINGS_CUSTOM_BIND, @@ -457,7 +456,7 @@ int menu_input_set_input_device_bind_mode(void *data, [setting->index_offset][0]; menu->binds.begin = MENU_SETTINGS_BIND_BEGIN; menu->binds.last = MENU_SETTINGS_BIND_LAST; - menu_list_push_stack( menu->menu_list, + menu_list_push( menu->menu_list->menu_stack, "", "custom_bind_all", MENU_SETTINGS_CUSTOM_BIND, diff --git a/menu/menu_list.c b/menu/menu_list.c index 7726fa75c3..614c478c29 100644 --- a/menu/menu_list.c +++ b/menu/menu_list.c @@ -374,14 +374,6 @@ void menu_list_push(file_list_t *list, menu_list_insert(list, path, label, type, directory_ptr); } -void menu_list_push_stack(menu_list_t *list, - const char *path, const char *label, - unsigned type, size_t directory_ptr) -{ - if (list) - menu_list_push(list->menu_stack, path, label, type, directory_ptr); -} - int menu_list_push_stack_refresh(menu_list_t *list, const char *path, const char *label, unsigned type, size_t directory_ptr) { @@ -393,7 +385,7 @@ int menu_list_push_stack_refresh(menu_list_t *list, const char *path, const char menu_driver_list_cache(false, 0); - menu_list_push_stack(list, path, label, type, directory_ptr); + menu_list_push(list->menu_stack, path, label, type, directory_ptr); menu_navigation_clear(&menu->navigation, true); menu->need_refresh = true; diff --git a/menu/menu_list.h b/menu/menu_list.h index 9273b48843..689d8cd810 100644 --- a/menu/menu_list.h +++ b/menu/menu_list.h @@ -86,10 +86,6 @@ void menu_list_push(file_list_t *list, const char *path, const char *label, unsigned type, size_t directory_ptr); -void menu_list_push_stack(menu_list_t *list, - const char *path, const char *label, - unsigned type, size_t directory_ptr); - int menu_list_push_stack_refresh(menu_list_t *list, const char *path, const char *label, unsigned type, size_t directory_ptr);