From 50944bb1e1d74b5e9c30b2ec4c38846ff080020f Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 8 May 2015 11:45:30 +0200
Subject: [PATCH] Use menu_list_get_entry
---
menu/menu_entries_cbs_iterate.c | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/menu/menu_entries_cbs_iterate.c b/menu/menu_entries_cbs_iterate.c
index 3ffc98a3fb..b0b9d21264 100644
--- a/menu/menu_entries_cbs_iterate.c
+++ b/menu/menu_entries_cbs_iterate.c
@@ -565,21 +565,16 @@ static int action_iterate_switch(const char *label, unsigned action)
static void action_iterate_post(int *ret, const char *label, unsigned action)
{
- unsigned type_offset = 0;
- const char *label_offset = NULL;
- const char *path_offset = NULL;
+ menu_entry_t entry;
menu_file_list_cbs_t *cbs = NULL;
menu_list_t *menu_list = menu_list_get_ptr();
size_t selected = menu_navigation_get_current_selection();
- cbs = (menu_file_list_cbs_t*)
- menu_list_get_actiondata_at_offset(menu_list->selection_buf,
- selected);
+ menu_list_get_entry(&entry, selected, NULL, false);
- menu_list_get_at_offset(menu_list->selection_buf,
- selected, &path_offset, &label_offset, &type_offset);
+ cbs = (menu_file_list_cbs_t*)menu_list_get_actiondata_at_offset(menu_list->selection_buf, selected);
- menu_input_post_iterate(ret, cbs, path_offset, label_offset, type_offset, action);
+ menu_input_post_iterate(ret, cbs, entry.path, entry.label, entry.type, action);
}
static int action_iterate_main(const char *label, unsigned action)