This commit is contained in:
twinaphex 2016-07-23 14:18:42 +02:00
parent 6ffa5ab6b2
commit 0c17c08bee

View File

@ -3232,10 +3232,13 @@ const char *config_get_active_path(void)
{ {
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
if (!string_is_empty(global->path.core_specific_config) if (!string_is_empty(global->path.core_specific_config)
&& settings->core_specific_config) && settings->core_specific_config)
return global->path.core_specific_config; return global->path.core_specific_config;
else if (!string_is_empty(global->path.config))
if (!string_is_empty(global->path.config))
return global->path.config; return global->path.config;
return NULL; return NULL;
} }