From 43220c088a79ca79980ff7bfcbf3f64bdb729921 Mon Sep 17 00:00:00 2001
From: nosh01 <dvxchamp@gmail.com>
Date: Wed, 9 May 2018 08:40:25 -0500
Subject: [PATCH] config_load_override() allow override configs to be loaded
 that match the content parent path name

---
 configuration.c | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/configuration.c b/configuration.c
index 4433f53ad6..679979ad27 100644
--- a/configuration.c
+++ b/configuration.c
@@ -2936,9 +2936,11 @@ end:
 bool config_load_override(void)
 {
    size_t path_size                       = PATH_MAX_LENGTH * sizeof(char);
+   char parent_name[PATH_MAX_LENGTH];
    char *buf                              = NULL;
    char *core_path                        = NULL;
    char *game_path                        = NULL;
+   char *parent_path                      = NULL;
    char *config_directory                 = NULL;
    config_file_t *new_conf                = NULL;
    bool should_append                     = false;
@@ -2947,6 +2949,9 @@ bool config_load_override(void)
       system->info.library_name : NULL;
    const char *game_name                  = path_basename(path_get(RARCH_PATH_BASENAME));
 
+   if (!string_is_empty(path_get(RARCH_PATH_BASENAME)))
+      fill_pathname_parent_dir_name(parent_name, path_get(RARCH_PATH_BASENAME), sizeof(parent_name));
+
    if (string_is_empty(core_name) || string_is_empty(game_name))
       return false;
 
@@ -2954,6 +2959,8 @@ bool config_load_override(void)
       malloc(PATH_MAX_LENGTH * sizeof(char));
    core_path                              = (char*)
       malloc(PATH_MAX_LENGTH * sizeof(char));
+   parent_path = (char*)
+      malloc(PATH_MAX_LENGTH * sizeof(char));
    buf                                    = (char*)
       malloc(PATH_MAX_LENGTH * sizeof(char));
    config_directory                       = (char*)
@@ -2970,6 +2977,12 @@ bool config_load_override(void)
          file_path_str(FILE_PATH_CONFIG_EXTENSION),
          path_size);
 
+   fill_pathname_join_special_ext(parent_path,
+      config_directory, core_name,
+      parent_name,
+      file_path_str(FILE_PATH_CONFIG_EXTENSION),
+      path_size);
+
    fill_pathname_join_special_ext(core_path,
          config_directory, core_name,
          core_name,
@@ -2994,6 +3007,24 @@ bool config_load_override(void)
       RARCH_LOG("[overrides] no core-specific overrides found at %s.\n",
             core_path);
 
+   /* Create a new config file from parent_path */
+   new_conf = config_file_new(parent_path);
+
+   /* If a core override exists, add its location to append_config_path */
+   if (new_conf)
+   {
+      RARCH_LOG("[overrides] core-specific overrides found at %s.\n",
+         parent_path);
+
+      config_file_free(new_conf);
+      path_set(RARCH_PATH_CONFIG_APPEND, parent_path);
+
+      should_append = true;
+   }
+   else
+      RARCH_LOG("[overrides] no core-specific overrides found at %s.\n",
+         parent_path);
+
    /* Create a new config file from game_path */
    new_conf = config_file_new(game_path);
 
@@ -3061,6 +3092,7 @@ bool config_load_override(void)
    free(buf);
    free(config_directory);
    free(core_path);
+   free(parent_path);
    free(game_path);
    return true;
 
@@ -3068,6 +3100,7 @@ error:
    free(buf);
    free(config_directory);
    free(core_path);
+   free(parent_path);
    free(game_path);
    return false;
 }