From ef31e08d2df33ec8246950761a2eac586522f72a Mon Sep 17 00:00:00 2001 From: Linus Dierheimer Date: Thu, 17 Jun 2021 13:59:18 +0200 Subject: [PATCH] Allow same GTK values in same file to overwrite each other --- src/common/detectGTK.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/common/detectGTK.c b/src/common/detectGTK.c index b3789ac7a..deb83b1d7 100644 --- a/src/common/detectGTK.c +++ b/src/common/detectGTK.c @@ -80,13 +80,17 @@ static void detectGTKFromConfigFile(const char* filename, FFGTKResult* result) char* line = NULL; size_t len = 0; + bool needsTheme = result->theme.length == 0; + bool needsIcons = result->icons.length == 0; + bool needsFont = result->font.length == 0; + while(getline(&line, &len, file) != -1) { - if(result->theme.length == 0) + if(needsTheme) ffGetPropValue(line, "gtk-theme-name =", &result->theme); - if(result->icons.length == 0) + if(needsIcons) ffGetPropValue(line, "gtk-icon-theme-name =", &result->icons); - if(result->font.length == 0) + if(needsFont) ffGetPropValue(line, "gtk-font-name =", &result->font); }