diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index ac18bdf31c..2dcdd796d6 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -912,7 +912,7 @@ static int generic_action_ok_file_load(const char *path, (void)id; - menu_list_get_last(menu_stack, &menu_path, NULL, NULL, NULL); + menu_entries_get_last(menu_stack, &menu_path, NULL, NULL, NULL); fill_pathname_join(new_path, menu_path, path, sizeof(new_path)); @@ -962,7 +962,7 @@ static int action_ok_file_load(const char *path, menu_handle_t *menu = menu_driver_get_ptr(); file_list_t *menu_stack = menu_entries_get_menu_stack_ptr(); - menu_list_get_last(menu_stack, &menu_path, &menu_label, NULL, NULL); + menu_entries_get_last(menu_stack, &menu_path, &menu_label, NULL, NULL); strlcpy(menu_path_new, menu_path, sizeof(menu_path_new)); diff --git a/menu/menu_entries.c b/menu/menu_entries.c index 7845cb59d5..5d12b475e7 100644 --- a/menu/menu_entries.c +++ b/menu/menu_entries.c @@ -106,7 +106,7 @@ void menu_entries_get_at_offset(const file_list_t *list, size_t idx, file_list_get_alt_at_offset(list, idx, alt); } -void menu_list_get_last(const file_list_t *list, +void menu_entries_get_last(const file_list_t *list, const char **path, const char **label, unsigned *file_type, size_t *entry_idx) { @@ -174,7 +174,7 @@ static void menu_list_flush_stack(menu_list_t *list, return; menu_entries_set_refresh(false); - menu_list_get_last(list->menu_stack, + menu_entries_get_last(list->menu_stack, &path, &label, &type, &entry_idx); while (menu_list_flush_stack_type( @@ -189,7 +189,7 @@ static void menu_list_flush_stack(menu_list_t *list, menu_navigation_ctl(MENU_NAVIGATION_CTL_SET_SELECTION, &new_selection_ptr); - menu_list_get_last(list->menu_stack, + menu_entries_get_last(list->menu_stack, &path, &label, &type, &entry_idx); } } @@ -611,7 +611,7 @@ void menu_entries_get_last_stack(const char **path, const char **label, { menu_list_t *menu_list = menu_list_get_ptr(); if (menu_list) - menu_list_get_last(menu_list->menu_stack, path, label, file_type, entry_idx); + menu_entries_get_last(menu_list->menu_stack, path, label, file_type, entry_idx); } void menu_entries_flush_stack(const char *needle, unsigned final_type) diff --git a/menu/menu_entries.h b/menu/menu_entries.h index 3cb38af5a9..8b03bfd786 100644 --- a/menu/menu_entries.h +++ b/menu/menu_entries.h @@ -159,7 +159,7 @@ void *menu_list_get_userdata_at_offset(const file_list_t *list, size_t idx); menu_file_list_cbs_t *menu_list_get_actiondata_at_offset(const file_list_t *list, size_t idx); -void menu_list_get_last(const file_list_t *list, +void menu_entries_get_last(const file_list_t *list, const char **path, const char **label, unsigned *file_type, size_t *entry_idx);