This commit is contained in:
twinaphex 2016-06-11 22:00:29 +02:00
parent 6f8b6a22b7
commit 7dc6d0f369

View File

@ -1971,18 +1971,8 @@ bool config_load_override(void)
if (string_is_empty(core_name) || string_is_empty(game_name))
return false;
/* Config directory: config_directory.
* Try config directory setting first,
* fallback to the location of the current configuration file. */
if (!string_is_empty(settings->directory.menu_config))
strlcpy(config_directory,
settings->directory.menu_config,
sizeof(config_directory));
else if (!string_is_empty(global->path.config))
fill_pathname_basedir(config_directory,
global->path.config, sizeof(config_directory));
else
return false;
fill_pathname_application_special(config_directory, sizeof(config_directory),
APPLICATION_SPECIAL_DIRECTORY_CONFIG);
/* Concatenate strings into full paths for core_path, game_path */
fill_pathname_join(game_path,