From ef3f4d9fa835df354226e60b71bb3498d11ad968 Mon Sep 17 00:00:00 2001
From: DarN <82701459+DarNCelsius@users.noreply.github.com>
Date: Sun, 9 May 2021 20:39:00 +0200
Subject: [PATCH] Tweaks

Hopefully an improvement
---
 src/modules/terminalfont.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/modules/terminalfont.c b/src/modules/terminalfont.c
index 8227bfa25..3f64cd3b2 100644
--- a/src/modules/terminalfont.c
+++ b/src/modules/terminalfont.c
@@ -50,7 +50,7 @@ static void printXCFETerminal(FFinstance* instance)
 
     ffParsePropFileConfig(instance, "xfce4/terminal/terminalrc", "FontUseSystem=%[^\n]", fontName.chars);
 
-    if((fontName.chars[0] == '\0') || ffStrbufCompS(&fontName, "TRUE"))
+    if((fontName.chars[0] == '\0') || !ffStrbufCompS(&fontName, "FALSE"))
     {
         printTerminalFontFromConfigFile(instance, "xfce4/terminal/terminalrc", "FontName=%[^\n]");
         ffStrbufDestroy(&fontName);
@@ -63,9 +63,6 @@ static void printXCFETerminal(FFinstance* instance)
     ffStrbufAppendC(&absolutePath, '/');
     ffStrbufAppendS(&absolutePath, ".config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml");
 
-    char* line = NULL;
-    size_t len = 0;
-
     FILE* file = fopen(absolutePath.chars, "r");
     if(file == NULL)
     {
@@ -79,9 +76,12 @@ static void printXCFETerminal(FFinstance* instance)
     FFstrbuf matchText;
     ffStrbufInitAS(&matchText, 64, "<property name=\"MonospaceFontName\" type=\"string\" value=\"");
 
+    char* line = NULL;
+    size_t len = 0;
+
     while(getline(&line, &len, file) != -1)
     {
-        ffStrbufSetS(&fontName, line);
+        ffStrbufAppendS(&fontName, line);
         ffStrbufTrimLeft(&fontName, ' ');
 
         if(ffStrbufStartsWithS(&fontName, matchText.chars))
@@ -90,8 +90,10 @@ static void printXCFETerminal(FFinstance* instance)
             ffStrbufSubstrBefore(&fontName, fontName.length - 4); // ["/>\n]
             break;
         }
-        ffStrbufSetC(&fontName, '\0');
+        ffStrbufClear(&fontName);
     }
+    ffStrbufDestroy(&matchText);
+    ffStrbufDestroy(&absolutePath);
 
     if(line != NULL)
         free(line);
@@ -103,8 +105,6 @@ static void printXCFETerminal(FFinstance* instance)
     else
         ffPrintError(instance, FF_TERMFONT_MODULE_NAME, 0, &instance->config.termFontKey, &instance->config.termFontFormat, FF_TERMFONT_NUM_FORMAT_ARGS, "Couldn't find \"MonospaceFontName=%%[^\\n]\" in \"xsettings.xml\"");
 
-    ffStrbufDestroy(&matchText);
-    ffStrbufDestroy(&absolutePath);
     ffStrbufDestroy(&fontName);
 }