From 70a54e6fcb252510b0aa37a1ad75546a0ab3544a Mon Sep 17 00:00:00 2001
From: radius <andres.430@gmail.com>
Date: Mon, 6 Apr 2015 21:54:59 -0500
Subject: [PATCH] make sure remap path is cleared if an auto remap file is not
 found

---
 configuration.c | 15 ++++++++++++---
 dynamic.c       |  1 -
 retroarch.c     | 10 +++++-----
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/configuration.c b/configuration.c
index 840e8de9c8..9c429f4de5 100644
--- a/configuration.c
+++ b/configuration.c
@@ -1753,7 +1753,7 @@ bool config_load_override(void)
    global_t *global = global_get_ptr();
    settings_t *settings = config_get_ptr();
 
-   *global->append_config_path = '\0';
+   *global->append_config_path = NULL;
    if (config_load_file(global->config_path, false))
    {
        RARCH_LOG("Configuration overrides unloaded, original configuration reset\n");
@@ -1825,8 +1825,12 @@ bool config_load_remap(void)
       if(input_remapping_load_file(game_path))
          return true;
    }
-   else
-      RARCH_LOG("No game-specific remap found at %s.\n", game_path);
+   else      
+   {
+      RARCH_LOG("No core-specific remap found at %s.\n", core_path);
+      *settings->input.remapping_path= '\0';
+      input_remapping_set_defaults();
+   }
 
    new_conf = NULL;
 
@@ -1841,7 +1845,12 @@ bool config_load_remap(void)
          return true;
    }
    else
+   {
       RARCH_LOG("No core-specific remap found at %s.\n", core_path);
+      *settings->input.remapping_path= '\0';
+      input_remapping_set_defaults();
+   }
+      
 
    new_conf = NULL;
 
diff --git a/dynamic.c b/dynamic.c
index db4f0b746f..7c4b0d287d 100644
--- a/dynamic.c
+++ b/dynamic.c
@@ -664,7 +664,6 @@ bool rarch_environment_cb(unsigned cmd, void *data)
 
          if (global->system.core_options)
          {
-            core_option_flush(global->system.core_options);
             core_option_free(global->system.core_options);
          }
 
diff --git a/retroarch.c b/retroarch.c
index cb562399e7..04572fc4ae 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -1853,15 +1853,15 @@ static void deinit_core(bool reinit)
 
    if (reinit)
       rarch_main_command(RARCH_CMD_DRIVERS_DEINIT);
-
    
+  if(global->system.core_options)
+     core_option_flush(global->system.core_options);
    
    if(global->overrides_active)
-   {       
-       config_unload_override();
-       pretro_set_environment(rarch_environment_cb);
+   {
+       config_unload_override();       
    }
-   
+   pretro_set_environment(rarch_environment_cb);
    uninit_libretro_sym();
 }