ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change how MENU_ACTION_REFRESH gets invoked

This commit is contained in:
twinaphex 2015-05-15 16:57:31 +02:00
parent 4ba2722020
commit f23962ff3b
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
menu/menu.c
View File

@ -274,6 +274,7 @@ int menu_iterate(retro_input_t input,
{ {
static retro_time_t last_clock_update = 0; static retro_time_t last_clock_update = 0;
int32_t ret = 0; int32_t ret = 0;
unsigned action = 0;
runloop_t *runloop = rarch_main_get_ptr(); runloop_t *runloop = rarch_main_get_ptr();
menu_handle_t *menu = menu_driver_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr();
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
@ -294,7 +295,12 @@ int menu_iterate(retro_input_t input,
last_clock_update = menu->cur_time; last_clock_update = menu->cur_time;
} }
menu_entry_iterate(menu->input.joypad); action = menu->input.joypad;
if (menu->need_refresh && !menu->nonblocking_refresh && action != MENU_ACTION_MESSAGE)
action = MENU_ACTION_REFRESH;
menu_entry_iterate(action);
if (runloop->is_menu && !runloop->is_idle) if (runloop->is_menu && !runloop->is_idle)
menu_display_fb(); menu_display_fb();

3
menu/menu_entries_cbs_iterate.c
View File

@ -528,9 +528,6 @@ static int action_iterate_main(const char *label, unsigned action)
return action_iterate_custom_bind(label, action); return action_iterate_custom_bind(label, action);
} }
if (menu->need_refresh && !menu->nonblocking_refresh && action != MENU_ACTION_MESSAGE)
action = MENU_ACTION_REFRESH;
ret = action_iterate_switch(action); ret = action_iterate_switch(action);
if (ret) if (ret)

3
menu/menu_entry.c
View File

@ -413,9 +413,6 @@ int menu_entry_select(uint32_t i)
action = MENU_ACTION_RIGHT; action = MENU_ACTION_RIGHT;
} }
if (menu->need_refresh && !menu->nonblocking_refresh && action != MENU_ACTION_MESSAGE)
action = MENU_ACTION_REFRESH;
if (action != MENU_ACTION_NOOP) if (action != MENU_ACTION_NOOP)
return menu_entry_action(&entry, i, action); return menu_entry_action(&entry, i, action);
return 0; return 0;