From 4f7ebbd964c885e54c2a0df112db74186345cdb7 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 3 Nov 2013 06:14:02 +0100
Subject: [PATCH] (Frontend) Remove ifdef

---
 frontend/frontend.c | 21 ++++++++++++++-------
 general.h           |  1 +
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/frontend/frontend.c b/frontend/frontend.c
index 4966bd8f87..264795f4a8 100644
--- a/frontend/frontend.c
+++ b/frontend/frontend.c
@@ -139,6 +139,12 @@ static void rarch_get_environment_console(void)
 #define rarch_get_environment_console() (void)0
 #endif
 
+#if defined(RARCH_CONSOLE) || defined(__QNX__)
+#define attempt_load_game_fails (1ULL << MODE_MENU)
+#else
+#define attempt_load_game_fails (1ULL << MODE_EXIT)
+#endif
+
 returntype main_entry(signature())
 {
    void *args = NULL;
@@ -193,14 +199,15 @@ returntype main_entry(signature())
             g_extern.lifecycle_mode_state |= (1ULL << MODE_GAME);
          else
          {
-#if defined(RARCH_CONSOLE) || defined(__QNX__)
-            g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU);
-#else
-            if (frontend_ctx && frontend_ctx->shutdown)
-               frontend_ctx->shutdown(true);
+            g_extern.lifecycle_mode_state = attempt_load_game_fails;
 
-            return_negative();
-#endif
+            if (g_extern.lifecycle_mode_state & (1ULL << MODE_EXIT))
+            {
+               if (frontend_ctx && frontend_ctx->shutdown)
+                  frontend_ctx->shutdown(true);
+
+               return_negative();
+            }
          }
 
          g_extern.lifecycle_mode_state &= ~(1ULL << MODE_LOAD_GAME);
diff --git a/general.h b/general.h
index c3f8351e0b..6ead7ea17f 100644
--- a/general.h
+++ b/general.h
@@ -110,6 +110,7 @@ enum menu_enums
    MODE_GAME = 0,
    MODE_LOAD_GAME,
    MODE_MENU,
+   MODE_EXIT,
    MODE_MENU_WIDESCREEN,
    MODE_MENU_HD,
    MODE_MENU_PREINIT,