From efb2f31a3b53f9bf11e563619bf2d8c1b1f959ee Mon Sep 17 00:00:00 2001 From: Zlika Date: Fri, 21 Sep 2018 22:36:09 +0200 Subject: [PATCH 1/2] Fixes #7130 --- menu/menu_input.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/menu/menu_input.c b/menu/menu_input.c index 8fdeb4f106..ea692389f3 100644 --- a/menu/menu_input.c +++ b/menu/menu_input.c @@ -567,6 +567,8 @@ void menu_input_post_iterate(int *ret, unsigned action) menu_entry_t entry; settings_t *settings = config_get_ptr(); file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0); + menu_input_t *menu_input = menu_input_get_ptr(); + menu_navigation_set_selection(menu_input->pointer.ptr); size_t selection = menu_navigation_get_selection(); menu_file_list_cbs_t *cbs = selection_buf ? (menu_file_list_cbs_t*)file_list_get_actiondata_at_offset(selection_buf, selection) : NULL; From e2c82d9ef84e520e1f0ab8c1e1f03b0c822972d6 Mon Sep 17 00:00:00 2001 From: Zlika Date: Sat, 22 Sep 2018 13:27:55 +0200 Subject: [PATCH 2/2] Fix C89 error --- menu/menu_input.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/menu/menu_input.c b/menu/menu_input.c index ea692389f3..09d034d361 100644 --- a/menu/menu_input.c +++ b/menu/menu_input.c @@ -565,12 +565,14 @@ static int menu_input_pointer_post_iterate( void menu_input_post_iterate(int *ret, unsigned action) { menu_entry_t entry; + size_t selection; + menu_file_list_cbs_t *cbs; settings_t *settings = config_get_ptr(); file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0); menu_input_t *menu_input = menu_input_get_ptr(); menu_navigation_set_selection(menu_input->pointer.ptr); - size_t selection = menu_navigation_get_selection(); - menu_file_list_cbs_t *cbs = selection_buf ? + selection = menu_navigation_get_selection(); + cbs = selection_buf ? (menu_file_list_cbs_t*)file_list_get_actiondata_at_offset(selection_buf, selection) : NULL; menu_entry_init(&entry);