From a66b16c8625c48090cf25a2b51463897bc97b690 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 5 Sep 2014 18:05:46 +0200 Subject: [PATCH] (frontend.c) Cleanup non-HAVE_MENU codepath --- frontend/frontend.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/frontend/frontend.c b/frontend/frontend.c index ad333f7f96..70daf4419c 100644 --- a/frontend/frontend.c +++ b/frontend/frontend.c @@ -103,6 +103,16 @@ int main_entry_iterate_content(signature(), args_type() args) return 0; } +#ifndef HAVE_MENU +static int main_entry_iterate_content_nomenu(signature(), args_type() args) +{ + if (!rarch_main_iterate()) + return 1; + + return 0; +} +#endif + #ifdef HAVE_MENU int main_entry_iterate_clear_input(signature(), args_type() args) { @@ -370,14 +380,12 @@ returntype main_entry(signature()) if (!g_extern.libretro_dummy) menu_content_history_push_current(); } +#else + frontend_loop = main_entry_iterate_content_nomenu; #endif #if defined(HAVE_MAIN_LOOP) -#if defined(HAVE_MENU) while (frontend_loop && !frontend_loop(signature_expand(), args)); -#else - while (rarch_main_iterate()); -#endif main_exit(args); #endif