From 0a35f5e7e9f4e08525cf634d57437bdd9e9d34f0 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 18 Aug 2015 01:58:18 +0200 Subject: [PATCH] menu_entry_get - cleanups --- menu/menu_entry.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/menu/menu_entry.c b/menu/menu_entry.c index 5688e046a0..62569f82be 100644 --- a/menu/menu_entry.c +++ b/menu/menu_entry.c @@ -293,7 +293,6 @@ float menu_entry_num_max(uint32_t i) void menu_entry_get(menu_entry_t *entry, size_t i, void *userdata, bool use_representation) { - const char *label = NULL; const char *path = NULL; const char *entry_label = NULL; menu_file_list_cbs_t *cbs = NULL; @@ -303,7 +302,6 @@ void menu_entry_get(menu_entry_t *entry, size_t i, if (!menu_list) return; - menu_list_get_last_stack(menu_list, NULL, &label, NULL, NULL); list = userdata ? (file_list_t*)userdata : menu_list->selection_buf; @@ -316,11 +314,15 @@ void menu_entry_get(menu_entry_t *entry, size_t i, cbs = menu_list_get_actiondata_at_offset(list, i); if (cbs && cbs->action_get_value && use_representation) + { + const char *label = NULL; + menu_list_get_last_stack(menu_list, NULL, &label, NULL, NULL); cbs->action_get_value(list, &entry->spacing, entry->type, i, label, entry->value, sizeof(entry->value), entry_label, path, entry->path, sizeof(entry->path)); + } entry->idx = i;