From e18199e8ecf0c5c52e036e0bc7700b455d0611e1 Mon Sep 17 00:00:00 2001
From: Linus Dierheimer <Linus@Dierheimer.de>
Date: Fri, 22 Oct 2021 18:42:14 +0200
Subject: [PATCH] Fix odering of XDG_CONFIG_DIRS

---
 src/common/detectPlasma.c | 11 +++++++----
 src/common/init.c         | 29 +++++++++++++++--------------
 src/fastfetch.h           |  2 +-
 3 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/common/detectPlasma.c b/src/common/detectPlasma.c
index e1b3b5bf3..3085fb2dd 100644
--- a/src/common/detectPlasma.c
+++ b/src/common/detectPlasma.c
@@ -41,14 +41,17 @@ static bool detectFromConfigFile(const FFstrbuf* filename, FFPlasmaResult* resul
             continue;
         }
 
-        if(category == PLASMA_CATEGORY_KDE)
+        if(category == PLASMA_CATEGORY_KDE && result->widgetStyle.length == 0)
             ffGetPropValue(line, "widgetStyle =", &result->widgetStyle);
-        else if(category == PLASMA_CATEGORY_ICONS)
+        else if(category == PLASMA_CATEGORY_ICONS && result->icons.length == 0)
             ffGetPropValue(line, "Theme =", &result->icons);
         else if(category == PLASMA_CATEGORY_GENERAL)
         {
-            ffGetPropValue(line, "ColorScheme =", &result->colorScheme);
-            ffGetPropValue(line, "font =", &result->font);
+            if(result->colorScheme.length == 0)
+                ffGetPropValue(line, "ColorScheme =", &result->colorScheme);
+
+            if(result->font.length == 0)
+                ffGetPropValue(line, "Font =", &result->font);
         }
     }
 
diff --git a/src/common/init.c b/src/common/init.c
index 5748fee19..91d36276c 100644
--- a/src/common/init.c
+++ b/src/common/init.c
@@ -25,20 +25,6 @@ static void initConfigDirs(FFstate* state)
     ffStrbufInitA(&xdgConfigDirs, 64);
     ffStrbufAppendS(&xdgConfigDirs, getenv("XDG_CONFIG_DIRS"));
 
-    uint32_t startIndex = 0;
-    while (startIndex < xdgConfigDirs.length)
-    {
-        uint32_t colonIndex = ffStrbufNextIndexC(&xdgConfigDirs, startIndex, ':');
-        xdgConfigDirs.chars[colonIndex] = '\0';
-
-        FFstrbuf* buffer = (FFstrbuf*) ffListAdd(&state->configDirs);
-        ffStrbufInitA(buffer, 64);
-        ffStrbufAppendS(buffer, xdgConfigDirs.chars + startIndex);
-        ffStrbufTrimRight(buffer, '/');
-
-        startIndex = colonIndex + 1;
-    }
-
     #define FF_ENSURE_ONLY_ONCE_IN_LIST(element) \
         if(ffListFirstIndexComp(&state->configDirs, element, strbufEqualsAdapter) < state->configDirs.length - 1) \
             --state->configDirs.length;
@@ -54,6 +40,21 @@ static void initConfigDirs(FFstate* state)
     ffStrbufAppendS(userHome, state->passwd->pw_dir);
     FF_ENSURE_ONLY_ONCE_IN_LIST(userHome)
 
+    uint32_t startIndex = 0;
+    while (startIndex < xdgConfigDirs.length)
+    {
+        uint32_t colonIndex = ffStrbufNextIndexC(&xdgConfigDirs, startIndex, ':');
+        xdgConfigDirs.chars[colonIndex] = '\0';
+
+        FFstrbuf* buffer = (FFstrbuf*) ffListAdd(&state->configDirs);
+        ffStrbufInitA(buffer, 64);
+        ffStrbufAppendS(buffer, xdgConfigDirs.chars + startIndex);
+        ffStrbufTrimRight(buffer, '/');
+        FF_ENSURE_ONLY_ONCE_IN_LIST(buffer);
+
+        startIndex = colonIndex + 1;
+    }
+
     FFstrbuf* systemConfigHome = ffListAdd(&state->configDirs);
     ffStrbufInitA(systemConfigHome, 64);
     ffStrbufAppendS(systemConfigHome, "/etc/xdg");
diff --git a/src/fastfetch.h b/src/fastfetch.h
index 490c089b1..cff2604a7 100644
--- a/src/fastfetch.h
+++ b/src/fastfetch.h
@@ -310,7 +310,7 @@ void ffLoadLogo(FFinstance* instance);
 void ffPrintLogoLine(FFinstance* instance);
 void ffPrintRemainingLogo(FFinstance* instance);
 
-#ifndef FLASHFETCH_BUILD_FLASHFATCH
+#ifndef FASTFETCH_BUILD_FLASHFATCH
     void ffListLogos();
     void ffPrintLogos(FFinstance* instance);
 #endif