From a17788a1f8c1cfde821f192e7f104c2f6d222d83 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 12 Jan 2015 03:31:02 +0100 Subject: [PATCH] Enable LEFT/RIGHT on Load Content (History). --- menu/menu_entries_cbs.c | 3 ++- menu/menu_list.c | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/menu/menu_entries_cbs.c b/menu/menu_entries_cbs.c index da7ce21b59..ff94c3aef4 100644 --- a/menu/menu_entries_cbs.c +++ b/menu/menu_entries_cbs.c @@ -1097,7 +1097,7 @@ static int action_toggle_save_state(unsigned type, const char *label, switch (action) { case MENU_ACTION_LEFT: - // Slot -1 is (auto) slot. + /* Slot -1 is (auto) slot. */ if (g_settings.state_slot >= 0) g_settings.state_slot--; break; @@ -2754,6 +2754,7 @@ static void menu_entries_cbs_init_bind_toggle(menu_file_list_cbs_t *cbs, case MENU_FILE_AUDIOFILTER: case MENU_FILE_CONFIG: case MENU_FILE_USE_DIRECTORY: + case MENU_FILE_PLAYLIST_ENTRY: cbs->action_toggle = action_toggle_scroll; break; case MENU_FILE_CONTENTLIST_ENTRY: diff --git a/menu/menu_list.c b/menu/menu_list.c index c89c2c3dc5..ef604d8298 100644 --- a/menu/menu_list.c +++ b/menu/menu_list.c @@ -117,7 +117,7 @@ void *menu_list_get_last_stack_actiondata(const menu_list_t *list) { if (!list) return NULL; - return file_list_get_last_actiondata(list->menu_stack); + return file_list_get_last_actiondata(list->menu_stack); } void menu_list_flush_stack(menu_list_t *list, @@ -132,6 +132,7 @@ void menu_list_flush_stack(menu_list_t *list, driver.menu->need_refresh = true; file_list_get_last(list->menu_stack, &path, &label, &type); + while (type != final_type) { menu_list_pop(list->menu_stack, &driver.menu->selection_ptr); @@ -151,6 +152,7 @@ void menu_list_flush_stack_by_needle(menu_list_t *list, driver.menu->need_refresh = true; file_list_get_last(list->menu_stack, &path, &label, &type); + while (strcmp(needle, label) != 0) { menu_list_pop(list->menu_stack, &driver.menu->selection_ptr);