mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up more code in frontend.c

Browse Source
This commit is contained in:
twinaphex 2014-09-21 07:39:17 +02:00
parent 29aed58e4e
commit bdf9df6c2e
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
frontend/frontend.c
View File

@ -71,14 +71,18 @@ static int main_entry_iterate_shutdown(signature(), args_type() args)
int main_entry_decide(signature(), args_type() args) int main_entry_decide(signature(), args_type() args)
{ {
#ifdef HAVE_MENU #ifdef HAVE_MENU
int ret = 1;
if (g_extern.system.shutdown) if (g_extern.system.shutdown)
return main_entry_iterate_shutdown(signature_expand(), args); ret = main_entry_iterate_shutdown(signature_expand(), args);
if (g_extern.lifecycle_state & (1ULL << MODE_GAME)) if (g_extern.lifecycle_state & (1ULL << MODE_GAME))
return main_entry_iterate_content(signature_expand(), args); ret = main_entry_iterate_content(signature_expand(), args);
if (g_extern.lifecycle_state & (1ULL << MODE_MENU)) if (g_extern.lifecycle_state & (1ULL << MODE_MENU))
return main_entry_iterate_menu(signature_expand(), args); ret = main_entry_iterate_menu(signature_expand(), args);
return 1; if (driver.frontend_ctx && driver.frontend_ctx->process_events)
driver.frontend_ctx->process_events(args);
return ret;
#else #else
return main_entry_iterate_content_nomenu(signature_expand(), args); return main_entry_iterate_content_nomenu(signature_expand(), args);
#endif #endif
@ -92,9 +96,6 @@ int main_entry_iterate_content(signature(), args_type() args)
return 0; return 0;
} }
if (driver.frontend_ctx && driver.frontend_ctx->process_events)
driver.frontend_ctx->process_events(args);
return 0; return 0;
} }
@ -114,11 +115,7 @@ int main_entry_iterate_menu(signature(), args_type() args)
retro_input_t input, old_state = 0; retro_input_t input, old_state = 0;
if (menu_iterate()) if (menu_iterate())
{
if (driver.frontend_ctx && driver.frontend_ctx->process_events)
driver.frontend_ctx->process_events(args);
return 0; return 0;
}
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); driver_set_nonblock_state(driver.nonblock_state);