From d96de429ea43a6988a2001c745e43dd92c859e7d Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 12 Sep 2014 05:01:07 +0200
Subject: [PATCH] (Menu) Add RARCH_CMD_LOAD_CONTENT_PERSIST

---
 frontend/menu/backend/menu_common_backend.c | 4 ++++
 general.h                                   | 1 +
 retroarch.c                                 | 7 +++++--
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/frontend/menu/backend/menu_common_backend.c b/frontend/menu/backend/menu_common_backend.c
index 7fd1e177ff..64881faed2 100644
--- a/frontend/menu/backend/menu_common_backend.c
+++ b/frontend/menu/backend/menu_common_backend.c
@@ -1432,6 +1432,10 @@ static int menu_action_ok(const char *menu_path,
                   sizeof(g_extern.fullpath));
 
             menu_common_load_content();
+            rarch_main_command(RARCH_CMD_LOAD_CONTENT_PERSIST);
+            menu_flush_stack_type(driver.menu->menu_stack,MENU_SETTINGS);
+            driver.menu->msg_force = true;
+            RARCH_LOG("Gets here.\n");
 
             return -1;
          }
diff --git a/general.h b/general.h
index b062faa5af..8340d3b983 100644
--- a/general.h
+++ b/general.h
@@ -95,6 +95,7 @@ enum basic_event
    RARCH_CMD_NONE = 0,
    RARCH_CMD_RESET,
    RARCH_CMD_LOAD_CONTENT,
+   RARCH_CMD_LOAD_CONTENT_PERSIST,
    RARCH_CMD_LOAD_CORE,
    RARCH_CMD_LOAD_STATE,
    RARCH_CMD_SAVE_STATE,
diff --git a/retroarch.c b/retroarch.c
index 001d457939..60d1b41023 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -3369,10 +3369,13 @@ void rarch_main_command(unsigned cmd)
 
    switch (cmd)
    {
-      case RARCH_CMD_LOAD_CONTENT:
-#ifdef HAVE_DYNAMIC
+      case RARCH_CMD_LOAD_CONTENT_PERSIST:
          rarch_main_command(RARCH_CMD_LOAD_CORE);
          rarch_main_set_state(RARCH_ACTION_STATE_LOAD_CONTENT);
+         break;
+      case RARCH_CMD_LOAD_CONTENT:
+#ifdef HAVE_DYNAMIC
+         rarch_main_command(RARCH_CMD_LOAD_CONTENT_PERSIST);
 #else
          rarch_environment_cb(RETRO_ENVIRONMENT_SET_LIBRETRO_PATH,
                (void*)g_settings.libretro);