From bc4e010a96f598eb750841c1771d1bb0113ad6dc Mon Sep 17 00:00:00 2001
From: twinaphex <autechre1024@hotmail.com>
Date: Tue, 8 Jan 2013 08:11:05 +0100
Subject: [PATCH] (RARCH_CONSOLE) frontend_console cleanups

---
 frontend/frontend_console.c | 16 ++++++++++++++--
 retroarch.c                 | 11 -----------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/frontend/frontend_console.c b/frontend/frontend_console.c
index 0b4f9fbdd2..ba57975186 100644
--- a/frontend/frontend_console.c
+++ b/frontend/frontend_console.c
@@ -47,6 +47,12 @@ static void init_drivers_console(void)
    init_audio();
 }
 
+static void uninit_drivers_console(void)
+{
+   driver.input->free(NULL);
+   driver.video->stop();
+}
+
 int main(int argc, char *argv[])
 {
    system_init();
@@ -115,9 +121,16 @@ begin_loop:
       int init_ret = rarch_main_init_wrap(&args);
 
       if (init_ret == 0)
+      {
          RARCH_LOG("rarch_main_init succeeded.\n");
+         g_extern.console.rmenu.mode = MODE_EMULATION;
+      }
       else
+      {
          RARCH_ERR("rarch_main_init failed.\n");
+         g_extern.console.rmenu.mode = MODE_MENU;
+         rarch_settings_msg(S_MSG_ROM_LOADING_ERROR, S_DELAY_180);
+      }
    }
    else if(g_extern.console.rmenu.mode == MODE_MENU)
       while(rmenu_iterate());
@@ -134,9 +147,8 @@ begin_shutdown:
    if(g_extern.main_is_init)
       rarch_main_deinit();
 
-   driver.input->free(NULL);
-   driver.video->stop();
    menu_free();
+   uninit_drivers_console();
 
 #ifdef HAVE_LOGGER
    logger_shutdown();
diff --git a/retroarch.c b/retroarch.c
index c48418709b..0f11ff8df6 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -2944,17 +2944,6 @@ int rarch_main_init_wrap(const struct rarch_main_wrap *args)
 
    int ret = rarch_main_init(argc, argv);
 
-#ifdef RARCH_CONSOLE
-   if (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);
-   }
-#endif
-
    for (int i = 0; i < ARRAY_SIZE(argv_copy); i++)
       free(argv_copy[i]);