From 0c17c08beea43542b49495c9af43683c0048f54a Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 23 Jul 2016 14:18:42 +0200 Subject: [PATCH] Cleanup --- configuration.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/configuration.c b/configuration.c index 90dd11b989..29bd6856a6 100644 --- a/configuration.c +++ b/configuration.c @@ -3232,10 +3232,13 @@ const char *config_get_active_path(void) { settings_t *settings = config_get_ptr(); global_t *global = global_get_ptr(); + if (!string_is_empty(global->path.core_specific_config) && settings->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 NULL; }