mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-02 07:20:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reduce calls to menu_list_pop

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

12
menu/menu_entries_cbs_iterate.c
View File

@ -251,9 +251,6 @@ static int action_iterate_info(const char *label, unsigned action)
menu_driver_render_messagebox(msg); menu_driver_render_messagebox(msg);
if (action == MENU_ACTION_OK)
menu_list_pop(menu_list->menu_stack, &menu->navigation.selection_ptr);
return ret; return ret;
} }
@ -468,9 +465,6 @@ static int action_iterate_message(const char *label, unsigned action)
menu_driver_render_messagebox(menu->message_contents); menu_driver_render_messagebox(menu->message_contents);
if (action == MENU_ACTION_OK)
menu_list_pop_stack(menu->menu_list);
return 0; return 0;
} }
@ -514,6 +508,7 @@ static int action_iterate_main(const char *label, unsigned action)
enum action_iterate_type iterate_type; enum action_iterate_type iterate_type;
menu_entry_t entry; menu_entry_t entry;
size_t selected; size_t selected;
bool do_pop_stack = false;
bool do_post_iterate = false; bool do_post_iterate = false;
bool do_render = false; bool do_render = false;
int ret = 0; int ret = 0;
@ -539,6 +534,7 @@ static int action_iterate_main(const char *label, unsigned action)
break; break;
case ITERATE_TYPE_INFO: case ITERATE_TYPE_INFO:
ret = action_iterate_info(label, action); ret = action_iterate_info(label, action);
do_pop_stack = true;
do_post_iterate = true; do_post_iterate = true;
break; break;
case ITERATE_TYPE_ZIP: case ITERATE_TYPE_ZIP:
@ -546,6 +542,7 @@ static int action_iterate_main(const char *label, unsigned action)
break; break;
case ITERATE_TYPE_MESSAGE: case ITERATE_TYPE_MESSAGE:
ret = action_iterate_message(label, action); ret = action_iterate_message(label, action);
do_pop_stack = true;
break; break;
case ITERATE_TYPE_DEFAULT: case ITERATE_TYPE_DEFAULT:
selected = menu_navigation_get_current_selection(); selected = menu_navigation_get_current_selection();
@ -571,6 +568,9 @@ static int action_iterate_main(const char *label, unsigned action)
break; break;
} }
if (do_pop_stack && action == MENU_ACTION_OK)
menu_list_pop(menu_list->menu_stack, &menu->navigation.selection_ptr);
if (do_post_iterate) if (do_post_iterate)
menu_input_post_iterate(&ret, action); menu_input_post_iterate(&ret, action);