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

Some control flow changes

This commit is contained in:
twinaphex 2014-09-14 15:32:32 +02:00
parent e9c865f56a
commit fe49a0fe40
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
frontend/frontend.c
View File

@ -209,23 +209,21 @@ int main_entry_iterate_menu(signature(), args_type() args)
if (g_extern.system.shutdown) if (g_extern.system.shutdown)
return main_entry_iterate_shutdown(signature_expand(), args); return main_entry_iterate_shutdown(signature_expand(), args);
if (menu_iterate()) if (!menu_iterate())
{ {
if (driver.frontend_ctx && driver.frontend_ctx->process_events) rarch_main_set_state(RARCH_ACTION_STATE_MENU_RUNNING_FINISHED);
driver.frontend_ctx->process_events(args); driver_set_nonblock_state(driver.nonblock_state);
return 0;
rarch_main_command(RARCH_CMD_AUDIO_START);
rarch_main_set_state(RARCH_ACTION_STATE_FLUSH_INPUT);
if (input_key_pressed_func(RARCH_QUIT_KEY) ||
!driver.video->alive(driver.video_data))
return 1;
} }
rarch_main_set_state(RARCH_ACTION_STATE_MENU_RUNNING_FINISHED); if (driver.frontend_ctx && driver.frontend_ctx->process_events)
driver_set_nonblock_state(driver.nonblock_state); driver.frontend_ctx->process_events(args);
rarch_main_command(RARCH_CMD_AUDIO_START);
rarch_main_set_state(RARCH_ACTION_STATE_FLUSH_INPUT);
if (input_key_pressed_func(RARCH_QUIT_KEY) ||
!driver.video->alive(driver.video_data))
return 1;
return 0; return 0;
} }
#endif #endif

3
retroarch.c
View File

@ -3285,9 +3285,6 @@ static inline void limit_frame_time(void)
void rarch_main_set_state(unsigned cmd) void rarch_main_set_state(unsigned cmd)
{ {
frontend_loop = NULL;
switch (cmd) switch (cmd)
{ {
case RARCH_ACTION_STATE_MENU_PREINIT: case RARCH_ACTION_STATE_MENU_PREINIT: