mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 19:20:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only call menu_list_pop from one place

Browse Source
This commit is contained in:
twinaphex 2015-05-18 21:58:17 +02:00
parent 6d91c1576d
commit 2fb240894c
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
menu/menu_entries_cbs_iterate.c
View File

@ -205,9 +205,6 @@ static int action_iterate_help(const char *label, unsigned action)
menu_driver_render_messagebox(msg);
if (action == MENU_ACTION_OK)
menu_list_pop(menu->menu_list->menu_stack, NULL);
return ret;
}
@ -507,7 +504,7 @@ static int action_iterate_main(const char *label, unsigned action)
{
enum action_iterate_type iterate_type;
menu_entry_t entry;
size_t selected;
size_t selected, *pop_selected = false;
bool do_pop_stack = false;
bool do_post_iterate = false;
bool do_render = false;
@ -523,6 +520,8 @@ static int action_iterate_main(const char *label, unsigned action)
{
case ITERATE_TYPE_HELP:
ret = action_iterate_help(label, action);
pop_selected = NULL;
do_pop_stack = true;
do_post_iterate = true;
break;
case ITERATE_TYPE_BIND:
@ -534,6 +533,7 @@ static int action_iterate_main(const char *label, unsigned action)
break;
case ITERATE_TYPE_INFO:
ret = action_iterate_info(label, action);
pop_selected = &menu->navigation.selection_ptr;
do_pop_stack = true;
do_post_iterate = true;
break;
@ -542,6 +542,7 @@ static int action_iterate_main(const char *label, unsigned action)
break;
case ITERATE_TYPE_MESSAGE:
ret = action_iterate_message(label, action);
pop_selected = &menu->navigation.selection_ptr;
do_pop_stack = true;
break;
case ITERATE_TYPE_DEFAULT:
@ -569,7 +570,7 @@ static int action_iterate_main(const char *label, unsigned action)
}
if (do_pop_stack && action == MENU_ACTION_OK)
menu_list_pop(menu_list->menu_stack, &menu->navigation.selection_ptr);
menu_list_pop(menu_list->menu_stack, pop_selected);
if (do_post_iterate)
menu_input_post_iterate(&ret, action);