CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-01-16 07:40:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use a goto in rarch_main_iterate

Browse Source
This commit is contained in:
twinaphex 2014-10-04 13:47:26 +02:00
parent f86ad85fcd
commit 3472987d9f
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
retroarch.c
View File

@ -3202,19 +3202,6 @@ static void do_state_check_menu_toggle(void)
rarch_main_set_state(RARCH_ACTION_STATE_MENU_RUNNING); rarch_main_set_state(RARCH_ACTION_STATE_MENU_RUNNING);
} }
static int do_menu_oneshot(
retro_input_t input, retro_input_t old_input,
retro_input_t trigger_input)
{
if (!menu_iterate(input, old_input, trigger_input))
rarch_main_set_state(RARCH_ACTION_STATE_MENU_RUNNING_FINISHED);
if (g_settings.fastforward_ratio_throttle_enable)
limit_frame_time();
return 0;
}
#endif #endif
static inline int time_to_exit(retro_input_t input) static inline int time_to_exit(retro_input_t input)
@ -3266,7 +3253,12 @@ int rarch_main_iterate(void)
do_state_check_menu_toggle(); do_state_check_menu_toggle();
if (g_extern.is_menu) if (g_extern.is_menu)
return do_menu_oneshot(input, old_input, trigger_input); {
if (!menu_iterate(input, old_input, trigger_input))
rarch_main_set_state(RARCH_ACTION_STATE_MENU_RUNNING_FINISHED);
goto success;
}
#endif #endif
if (g_extern.exec) if (g_extern.exec)
@ -3341,6 +3333,7 @@ int rarch_main_iterate(void)
unlock_autosave(); unlock_autosave();
#endif #endif
success:
if (g_settings.fastforward_ratio_throttle_enable) if (g_settings.fastforward_ratio_throttle_enable)
limit_frame_time(); limit_frame_time();