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

Move stateful code over to rarch_main_set_state (for menu toggling)

This commit is contained in:
twinaphex 2014-09-29 12:44:17 +02:00
parent 2523337416
commit 5751dfdecf
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
retroarch.c
View File

@ -2836,6 +2836,14 @@ void rarch_main_set_state(unsigned cmd)
break; break;
case RARCH_ACTION_STATE_MENU_RUNNING_FINISHED: case RARCH_ACTION_STATE_MENU_RUNNING_FINISHED:
g_extern.is_menu = false; g_extern.is_menu = false;
driver_set_nonblock_state(driver.nonblock_state);
rarch_main_command(RARCH_CMD_AUDIO_START);
driver.block_libretro_input_until = g_extern.frame_count + (5);
/* Restore libretro keyboard callback. */
g_extern.system.key_event = g_extern.frontend_key_event;
break; break;
case RARCH_ACTION_STATE_EXITSPAWN: case RARCH_ACTION_STATE_EXITSPAWN:
g_extern.lifecycle_state |= (1ULL << MODE_EXITSPAWN); g_extern.lifecycle_state |= (1ULL << MODE_EXITSPAWN);
@ -3212,16 +3220,7 @@ bool rarch_main_iterate(void)
(check_enter_menu_func(trigger_input) && (check_enter_menu_func(trigger_input) &&
g_extern.main_is_init && !g_extern.libretro_dummy) g_extern.main_is_init && !g_extern.libretro_dummy)
) )
{
rarch_main_set_state(RARCH_ACTION_STATE_MENU_RUNNING_FINISHED); rarch_main_set_state(RARCH_ACTION_STATE_MENU_RUNNING_FINISHED);
driver_set_nonblock_state(driver.nonblock_state);
rarch_main_command(RARCH_CMD_AUDIO_START);
driver.block_libretro_input_until = g_extern.frame_count + (5);
/* Restore libretro keyboard callback. */
g_extern.system.key_event = g_extern.frontend_key_event;
}
goto end; goto end;
} }