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

Take out MODE_EXIT

Browse Source
This commit is contained in:
twinaphex 2014-05-12 16:01:00 +02:00
parent dda574ddf1
commit 10c801b64e
2 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
frontend/frontend.c
View File

@ -111,11 +111,6 @@ static void rarch_get_environment_console(void)
#define rarch_get_environment_console() (void)0 #define rarch_get_environment_console() (void)0
#endif #endif
#if defined(RARCH_CONSOLE) || defined(__QNX__) || defined(ANDROID)
#define attempt_load_game_fails (1ULL << MODE_MENU_PREINIT)
#else
#define attempt_load_game_fails (1ULL << MODE_EXIT)
#endif
static retro_keyboard_event_t key_event; static retro_keyboard_event_t key_event;
@ -179,16 +174,13 @@ static int main_entry_iterate_load_content(args_type() args)
} }
else else
{ {
// If ROM load fails, we exit RetroArch. On console it might make more sense to go back to menu though ... #if defined(RARCH_CONSOLE) || defined(RARCH_MOBILE)
g_extern.lifecycle_state = attempt_load_game_fails; // If ROM load fails, we go back to menu.
g_extern.lifecycle_state = (1ULL << MODE_MENU_PREINIT);
if (g_extern.lifecycle_state & (1ULL << MODE_EXIT)) #else
{ // If ROM load fails, we exit RetroArch.
if (frontend_ctx && frontend_ctx->shutdown) g_extern.system.shutdown = true;
frontend_ctx->shutdown(true); #endif
return 1;
}
} }
g_extern.lifecycle_state &= ~(1ULL << MODE_LOAD_GAME); g_extern.lifecycle_state &= ~(1ULL << MODE_LOAD_GAME);

1
general.h
View File

@ -93,7 +93,6 @@ enum menu_enums
MODE_GAME = 0, MODE_GAME = 0,
MODE_LOAD_GAME, MODE_LOAD_GAME,
MODE_MENU, MODE_MENU,
MODE_EXIT,
MODE_MENU_WIDESCREEN, MODE_MENU_WIDESCREEN,
MODE_MENU_HD, MODE_MENU_HD,
MODE_MENU_PREINIT, MODE_MENU_PREINIT,