From c572a5b5443c656fb913ad2e79c0a28cf1a60e85 Mon Sep 17 00:00:00 2001
From: twinaphex <autechre1024@hotmail.com>
Date: Sun, 6 Jan 2013 01:39:21 +0100
Subject: [PATCH] (RARCH_CONSOLE) Remove initialize_rarch_enable

---
 console/rarch_console_main_wrap.c | 45 +++++++++++++------------------
 console/rarch_console_settings.c  |  4 ---
 general.h                         |  1 -
 3 files changed, 19 insertions(+), 31 deletions(-)

diff --git a/console/rarch_console_main_wrap.c b/console/rarch_console_main_wrap.c
index 9011681f20..ca3f2b67da 100644
--- a/console/rarch_console_main_wrap.c
+++ b/console/rarch_console_main_wrap.c
@@ -81,38 +81,31 @@ static int rarch_main_init_wrap(const struct rarch_main_wrap *args)
 
 bool rarch_startup (const char * config_path)
 {
-   bool retval = false;
+   if(g_extern.main_is_init)
+      rarch_main_deinit();
 
-   if(g_extern.console.initialize_rarch_enable)
-   {
-      if(g_extern.main_is_init)
-         rarch_main_deinit();
+   struct rarch_main_wrap args = {0};
 
-      struct rarch_main_wrap args = {0};
-
-      args.verbose = g_extern.verbose;
-      args.config_path = config_path;
-      args.sram_path = g_extern.console.main_wrap.state.default_sram_dir.enable ? g_extern.console.main_wrap.paths.default_sram_dir : NULL,
+   args.verbose = g_extern.verbose;
+   args.config_path = config_path;
+   args.sram_path = g_extern.console.main_wrap.state.default_sram_dir.enable ? g_extern.console.main_wrap.paths.default_sram_dir : NULL,
       args.state_path = g_extern.console.main_wrap.state.default_savestate_dir.enable ? g_extern.console.main_wrap.paths.default_savestate_dir : NULL,
       args.rom_path = g_extern.file_state.rom_path;
-      args.libretro_path = g_settings.libretro;
+   args.libretro_path = g_settings.libretro;
 
-      int init_ret = rarch_main_init_wrap(&args);
-      (void)init_ret;
+   int init_ret = rarch_main_init_wrap(&args);
+   (void)init_ret;
 
-      if(init_ret == 0)
-      {
-         g_extern.console.initialize_rarch_enable = 0;
-         g_extern.console.rmenu.mode = MODE_EMULATION;
-         retval = true;
-      }
-      else
-      {
-         //failed to load the ROM for whatever reason
-         g_extern.console.rmenu.mode = MODE_MENU;
-         rarch_settings_msg(S_MSG_ROM_LOADING_ERROR, S_DELAY_180);
-      }
+   if(init_ret == 0)
+      g_extern.console.rmenu.mode = MODE_EMULATION;
+   else
+   {
+      //failed to load the ROM for whatever reason
+      g_extern.console.rmenu.mode = MODE_MENU;
+      rarch_settings_msg(S_MSG_ROM_LOADING_ERROR, S_DELAY_180);
+
+      return false;
    }
 
-   return retval;
+   return true;
 }
diff --git a/console/rarch_console_settings.c b/console/rarch_console_settings.c
index 78335037f3..2887c244f3 100644
--- a/console/rarch_console_settings.c
+++ b/console/rarch_console_settings.c
@@ -94,7 +94,6 @@ void rarch_settings_change(unsigned setting)
          break;
       case S_QUIT_RARCH:
          g_extern.console.rmenu.state.rmenu.enable = false;
-         g_extern.console.initialize_rarch_enable = false;
          g_extern.console.rmenu.mode = MODE_EXIT;
          break;
       case S_RETURN_TO_GAME:
@@ -104,7 +103,6 @@ void rarch_settings_change(unsigned setting)
       case S_RETURN_TO_LAUNCHER:
          g_extern.console.external_launch.enable = true;
          g_extern.console.rmenu.state.rmenu.enable = false;
-         g_extern.console.initialize_rarch_enable = false;
          g_extern.console.rmenu.mode = MODE_EXIT;
          break;
       case S_RETURN_TO_MENU:
@@ -122,7 +120,6 @@ void rarch_settings_change(unsigned setting)
          break;
       case S_START_RARCH:
          g_extern.console.rmenu.state.rmenu.enable = false;
-         g_extern.console.initialize_rarch_enable = 1;
          g_extern.console.rmenu.mode = MODE_INIT;
          break;
       case S_REWIND:
@@ -380,7 +377,6 @@ void rarch_settings_set_default(void)
    g_extern.console.screen.overscan_amount = 0.0f;
    g_extern.console.sound.custom_bgm.enable = true;
    g_extern.console.screen.gamma_correction = DEFAULT_GAMMA;
-   g_extern.console.initialize_rarch_enable = false;
    g_extern.console.screen.state.screenshots.enable = true;
    g_extern.console.screen.state.throttle.enable = true;
    g_extern.console.rmenu.state.msg_info.enable = true;
diff --git a/general.h b/general.h
index b50356f265..73d281b160 100644
--- a/general.h
+++ b/general.h
@@ -476,7 +476,6 @@ struct global
    struct
    {
       bool block_config_read;
-      bool initialize_rarch_enable;
       rarch_frame_count_t general_timers[2];
 
       struct