X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsettings.cpp;h=6273f7c7400c70c09de1fe5dad23ac8068f8be68;hp=c3713d9c1a17d8eae31d0af0f6b5262a8c97af52;hb=c27d5bfbe80bfeb583a25404f4ccee4b70b010e0;hpb=424eddc71def51d22ec9f19d6a57c06af0d25295

diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index c3713d9c..6273f7c7 100644
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2016 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -120,11 +120,25 @@ void Settings::setVersionMinor(const uint versionMinor)
     s.setValue("Config/VersionMinor", versionMinor);
 }
 
+
+bool Settings::sync() {
+    create_qsettings;
+    s.sync();
+    switch (s.status()) {
+        case QSettings::NoError:
+            return true;
+        default:
+            return false;
+    }
+}
+
+
 bool Settings::isWritable() {
     create_qsettings;
     return s.isWritable();
 }
 
+
 QStringList Settings::allLocalKeys()
 {
     create_qsettings;
@@ -189,12 +203,12 @@ const QVariant &Settings::localValue(const QString &key, const QVariant &def)
     return cacheValue(normKey);
 }
 
+
 bool Settings::localKeyExists(const QString &key)
 {
     QString normKey = normalizedKey(group, key);
-    if (isCached(normKey))
-        return true;
-
+    // Do NOT check the cache as default values get cached, too.  Otherwise loading a setting once
+    // will mark it as existing in settings, even when it only exists in cache (and not on disk).
     create_qsettings;
     return s.contains(normKey);
 }
@@ -207,6 +221,10 @@ void Settings::removeLocalKey(const QString &key)
     s.remove(key);
     s.endGroup();
     QString normKey = normalizedKey(group, key);
-    if (isCached(normKey))
+    if (isCached(normKey)) {
         settingsCache.remove(normKey);
+    }
+    if (hasNotifier(normKey)) {
+        emit notifier(normKey)->valueChanged({});
+    }
 }