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

rarch_main_iterate - another change

Browse Source
This commit is contained in:
twinaphex 2015-08-27 12:48:35 +02:00
parent bcb54b2eec
commit 3b9eca025e
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
runloop.c
View File

@ -1033,20 +1033,6 @@ int rarch_main_iterate(void)
#ifdef HAVE_OVERLAY
rarch_main_iterate_linefeed_overlay(driver, settings);
#endif
#ifdef HAVE_MENU
if (menu_driver_alive())
{
menu_handle_t *menu = menu_driver_get_ptr();
if (menu)
if (menu_iterate(true, menu_input_frame(input, trigger_input)) == -1)
rarch_main_set_state(RARCH_ACTION_STATE_MENU_RUNNING_FINISHED);
if (!input && settings->menu.pause_libretro)
return 1;
goto success;
}
#endif
if (global->exec)
{
@ -1075,6 +1061,20 @@ int rarch_main_iterate(void)
return -1;
}
#ifdef HAVE_MENU
if (menu_driver_alive())
{
menu_handle_t *menu = menu_driver_get_ptr();
if (menu)
if (menu_iterate(true, menu_input_frame(input, trigger_input)) == -1)
rarch_main_set_state(RARCH_ACTION_STATE_MENU_RUNNING_FINISHED);
if (!input && settings->menu.pause_libretro)
return 1;
goto success;
}
#endif
if (main_is_idle || do_state_checks(driver, settings, global, &cmd))
{