From f23962ff3bd4f12f06b3cf4e3c7cb6dbe918a1bf Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 15 May 2015 16:57:31 +0200 Subject: [PATCH] Change how MENU_ACTION_REFRESH gets invoked --- menu/menu.c | 8 +++++++- menu/menu_entries_cbs_iterate.c | 3 --- menu/menu_entry.c | 3 --- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/menu/menu.c b/menu/menu.c index 75b5111379..0a90cf50df 100644 --- a/menu/menu.c +++ b/menu/menu.c @@ -274,6 +274,7 @@ int menu_iterate(retro_input_t input, { static retro_time_t last_clock_update = 0; int32_t ret = 0; + unsigned action = 0; runloop_t *runloop = rarch_main_get_ptr(); menu_handle_t *menu = menu_driver_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; } - 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) menu_display_fb(); diff --git a/menu/menu_entries_cbs_iterate.c b/menu/menu_entries_cbs_iterate.c index 2c8bcffc00..64e4dd0687 100644 --- a/menu/menu_entries_cbs_iterate.c +++ b/menu/menu_entries_cbs_iterate.c @@ -528,9 +528,6 @@ static int action_iterate_main(const char *label, unsigned 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); if (ret) diff --git a/menu/menu_entry.c b/menu/menu_entry.c index ad0b51a6e4..4fa4d8d793 100644 --- a/menu/menu_entry.c +++ b/menu/menu_entry.c @@ -413,9 +413,6 @@ int menu_entry_select(uint32_t i) action = MENU_ACTION_RIGHT; } - if (menu->need_refresh && !menu->nonblocking_refresh && action != MENU_ACTION_MESSAGE) - action = MENU_ACTION_REFRESH; - if (action != MENU_ACTION_NOOP) return menu_entry_action(&entry, i, action); return 0;