From 5bb482d61c2a59e9b0233162b98d09f620e8eb0c Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 7 May 2015 10:50:29 +0200 Subject: [PATCH] action_iterate_main - use menu_list_get_ptr --- menu/menu_entries_cbs_iterate.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/menu/menu_entries_cbs_iterate.c b/menu/menu_entries_cbs_iterate.c index fac5c26243..b828a4b1ed 100644 --- a/menu/menu_entries_cbs_iterate.c +++ b/menu/menu_entries_cbs_iterate.c @@ -490,6 +490,7 @@ static int action_iterate_main(const char *label, unsigned action) const char *path_offset = NULL; menu_file_list_cbs_t *cbs = NULL; menu_handle_t *menu = menu_driver_get_ptr(); + menu_list_t *menu_list = menu_list_get_ptr(); menu_navigation_t *nav = menu_navigation_get_ptr(); global_t *global = global_get_ptr(); size_t selected = menu_navigation_get_current_selection(); @@ -497,10 +498,10 @@ static int action_iterate_main(const char *label, unsigned action) return 0; cbs = (menu_file_list_cbs_t*) - menu_list_get_actiondata_at_offset(menu->menu_list->selection_buf, + menu_list_get_actiondata_at_offset(menu_list->selection_buf, selected); - menu_list_get_at_offset(menu->menu_list->selection_buf, + menu_list_get_at_offset(menu_list->selection_buf, selected, &path_offset, &label_offset, &type_offset); if (!strcmp(label, "help")) @@ -570,8 +571,7 @@ static int action_iterate_main(const char *label, unsigned action) case MENU_ACTION_REFRESH: if (cbs && cbs->action_refresh) - ret = cbs->action_refresh(menu->menu_list->selection_buf, - menu->menu_list->menu_stack); + ret = cbs->action_refresh(menu_list->selection_buf, menu_list->menu_stack); break; case MENU_ACTION_MESSAGE: @@ -605,7 +605,7 @@ static int action_iterate_main(const char *label, unsigned action) /* Have to defer it so we let settings refresh. */ if (menu->push_start_screen) { - menu_list_push_stack(menu->menu_list, "", "help", 0, 0); + menu_list_push_stack(menu_list, "", "help", 0, 0); menu->push_start_screen = false; }