From c7d6eaa8303f6b11e6ae9a0d7d7ec6e5ca2b56b7 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 29 Sep 2014 13:27:28 +0200
Subject: [PATCH] Refactor RARCH_ACTION_STATE_MENU_PREINIT into
 RARCH_ACTION_STATE_MENU_RUNNING

---
 frontend/platform/platform_android.c |  3 ---
 general.h                            |  1 -
 retroarch.c                          | 11 ++++-------
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/frontend/platform/platform_android.c b/frontend/platform/platform_android.c
index 5fd7b0ea90..eba9c6d3c8 100644
--- a/frontend/platform/platform_android.c
+++ b/frontend/platform/platform_android.c
@@ -730,9 +730,6 @@ static void process_pending_intent(void *data)
 
    if (startgame)
    {
-      rarch_main_set_state(RARCH_ACTION_STATE_MENU_PREINIT_FINISHED);
-      rarch_main_set_state(RARCH_ACTION_STATE_MENU_RUNNING_FINISHED);
-      rarch_main_command(RARCH_CMD_LOAD_CONTENT);
    }
 
    CALL_VOID_METHOD(env, android_app->activity->clazz,
diff --git a/general.h b/general.h
index 43c282fbf5..757fde4d4a 100644
--- a/general.h
+++ b/general.h
@@ -136,7 +136,6 @@ enum basic_event
 enum action_state
 {
    RARCH_ACTION_STATE_NONE = 0,
-   RARCH_ACTION_STATE_MENU_PREINIT,
    RARCH_ACTION_STATE_LOAD_CONTENT,
    RARCH_ACTION_STATE_MENU_RUNNING,
    RARCH_ACTION_STATE_MENU_RUNNING_FINISHED,
diff --git a/retroarch.c b/retroarch.c
index c21eb492a4..dcda8ea87c 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -2789,7 +2789,7 @@ void rarch_main_set_state(unsigned cmd)
 {
    switch (cmd)
    {
-      case RARCH_ACTION_STATE_MENU_PREINIT:
+      case RARCH_ACTION_STATE_MENU_RUNNING:
          {
             int i;
 
@@ -2815,11 +2815,11 @@ void rarch_main_set_state(unsigned cmd)
                g_extern.system.key_event = menu_key_event;
 
                driver.menu->need_refresh = true;
-               rarch_main_set_state(RARCH_ACTION_STATE_MENU_RUNNING);
             }
 #endif
             g_extern.system.frame_time_last = 0;
          }
+         g_extern.is_menu = true;
          break;
       case RARCH_ACTION_STATE_LOAD_CONTENT:
 #ifdef HAVE_MENU
@@ -2827,13 +2827,10 @@ void rarch_main_set_state(unsigned cmd)
          {
             /* If content loading fails, we go back to menu. */
             if (driver.menu)
-               rarch_main_set_state(RARCH_ACTION_STATE_MENU_PREINIT);
+               rarch_main_set_state(RARCH_ACTION_STATE_MENU_RUNNING);
          }
 #endif
          break;
-      case RARCH_ACTION_STATE_MENU_RUNNING:
-         g_extern.is_menu = true;
-         break;
       case RARCH_ACTION_STATE_MENU_RUNNING_FINISHED:
          g_extern.is_menu = false;
 
@@ -3202,7 +3199,7 @@ static void do_state_check_menu_toggle(void)
       return;
    }
 
-   rarch_main_set_state(RARCH_ACTION_STATE_MENU_PREINIT);
+   rarch_main_set_state(RARCH_ACTION_STATE_MENU_RUNNING);
 }
 
 bool rarch_main_iterate(void)