From 1c56121519a2bc43dfb40dae03e62a8afb346857 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Mon, 1 Jun 2015 07:39:47 +0200 Subject: [PATCH 1/3] Remove unused variable --- menu/menu_entry.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/menu/menu_entry.c b/menu/menu_entry.c index a3fd51d670..69ce80a1e7 100644 --- a/menu/menu_entry.c +++ b/menu/menu_entry.c @@ -393,8 +393,6 @@ int menu_entry_select(uint32_t i) { menu_entry_t entry; menu_list_t *menu_list = menu_list_get_ptr(); - rarch_setting_t *setting = menu_setting_find( - menu_list->selection_buf->list[i].label); menu_entry_get(&entry, i, NULL, false); From 2eae195c73f4e79c75fd81272c1feeb6f67a3d66 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Mon, 1 Jun 2015 07:40:36 +0200 Subject: [PATCH 2/3] Remove another unused variable --- menu/menu_entry.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/menu/menu_entry.c b/menu/menu_entry.c index 69ce80a1e7..a0930190fe 100644 --- a/menu/menu_entry.c +++ b/menu/menu_entry.c @@ -392,8 +392,6 @@ int menu_entry_get_current_id(bool use_representation) int menu_entry_select(uint32_t i) { menu_entry_t entry; - menu_list_t *menu_list = menu_list_get_ptr(); - menu_entry_get(&entry, i, NULL, false); return menu_entry_action(&entry, i, MENU_ACTION_SELECT); From b3c28bb56fd56db806efbc83825d77ff8c218542 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Mon, 1 Jun 2015 07:49:49 +0200 Subject: [PATCH 3/3] (menu_entry) Cleanups --- menu/menu_entries_cbs_select.c | 2 -- menu/menu_entry.c | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/menu/menu_entries_cbs_select.c b/menu/menu_entries_cbs_select.c index 3aaae73157..4ce5211ce8 100644 --- a/menu/menu_entries_cbs_select.c +++ b/menu/menu_entries_cbs_select.c @@ -27,7 +27,6 @@ static int action_select_default(const char *path, const char *label, unsigned t menu_entry_t entry; enum menu_action action = MENU_ACTION_NOOP; menu_file_list_cbs_t *cbs = NULL; - menu_navigation_t *nav = menu_navigation_get_ptr(); menu_list_t *menu_list = menu_list_get_ptr(); rarch_setting_t *setting = menu_setting_find( menu_list->selection_buf->list[idx].label); @@ -39,7 +38,6 @@ static int action_select_default(const char *path, const char *label, unsigned t if (setting_is_of_path_type(setting)) return 0; - nav->selection_ptr = idx; if ((cbs && cbs->action_ok) || setting_is_of_general_type(setting)) action = MENU_ACTION_OK; else diff --git a/menu/menu_entry.c b/menu/menu_entry.c index a0930190fe..e0ea291918 100644 --- a/menu/menu_entry.c +++ b/menu/menu_entry.c @@ -392,6 +392,9 @@ int menu_entry_get_current_id(bool use_representation) int menu_entry_select(uint32_t i) { menu_entry_t entry; + menu_navigation_t *nav = menu_navigation_get_ptr(); + + nav->selection_ptr = i; menu_entry_get(&entry, i, NULL, false); return menu_entry_action(&entry, i, MENU_ACTION_SELECT);