summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleix Pol <aleixpol@kde.org>2017-10-25 11:20:37 (GMT)
committerAleix Pol <aleixpol@kde.org>2017-10-25 11:20:37 (GMT)
commit952ab8f36e3c52a7ac6830ffd5b5c65f71fa0931 (patch)
treeef86063dd84704def4e685b1057b8dbec2b396c6
parentefa8c4df5b567d382317bd6f375cd1763737ff95 (diff)
Be flexible to systems without a gtkrc file in /etc
Always load both files and make the best out of them BUG: 382291
-rw-r--r--src/appearancegtk2.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/appearancegtk2.cpp b/src/appearancegtk2.cpp
index 92cbee3..1fd3ea2 100644
--- a/src/appearancegtk2.cpp
+++ b/src/appearancegtk2.cpp
@@ -188,7 +188,9 @@ bool AppearanceGTK2::loadSettings()
{
reset();
- return loadSettingsPrivate("/etc/gtk-2.0/gtkrc") && loadSettingsPrivate(defaultConfigFile());
+ bool b = loadSettingsPrivate("/etc/gtk-2.0/gtkrc");
+ b |= loadSettingsPrivate(defaultConfigFile());
+ return b;
}
bool AppearanceGTK2::saveSettings() const