X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsettings.cpp;h=2330f45fed49934ce1e0eb78e770aecefb36d476;hp=cdb152cdf2b11b2d19b3ab7ebe2e0f0b39546cdf;hb=8582c2ad5708a1972c85bea1cf8d81ad3ece4814;hpb=10e6f4629e39c66cfb8db6ab2806bf8f13ec700b

diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index cdb152cd..2330f45f 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  *
@@ -30,6 +30,7 @@ const int VERSION = 1;              /// Settings version for backwords/forwards
 const int VERSION_MINOR_INITIAL = 1; /// Initial settings version for compatible changes
 
 QHash<QString, QVariant> Settings::settingsCache;
+QHash<QString, bool> Settings::settingsKeyPersistedCache;
 QHash<QString, SettingsChangeNotifier *> Settings::settingsChangeNotifier;
 
 #ifdef Q_OS_MAC
@@ -120,6 +121,7 @@ void Settings::setVersionMinor(const uint versionMinor)
     s.setValue("Config/VersionMinor", versionMinor);
 }
 
+
 bool Settings::sync() {
     create_qsettings;
     s.sync();
@@ -131,11 +133,13 @@ bool Settings::sync() {
     }
 }
 
+
 bool Settings::isWritable() {
     create_qsettings;
     return s.isWritable();
 }
 
+
 QStringList Settings::allLocalKeys()
 {
     create_qsettings;
@@ -183,6 +187,7 @@ void Settings::setLocalValue(const QString &key, const QVariant &data)
     QString normKey = normalizedKey(group, key);
     create_qsettings;
     s.setValue(normKey, data);
+    setCacheKeyPersisted(normKey, true);
     setCacheValue(normKey, data);
     if (hasNotifier(normKey)) {
         emit notifier(normKey)->valueChanged(data);
@@ -190,24 +195,37 @@ void Settings::setLocalValue(const QString &key, const QVariant &data)
 }
 
 
-const QVariant &Settings::localValue(const QString &key, const QVariant &def)
+QVariant Settings::localValue(const QString &key, const QVariant &def)
 {
     QString normKey = normalizedKey(group, key);
     if (!isCached(normKey)) {
         create_qsettings;
+        // Since we're loading from settings anyways, cache whether or not the key exists on disk
+        setCacheKeyPersisted(normKey, s.contains(normKey));
+        // Cache key value
         setCacheValue(normKey, s.value(normKey, def));
     }
-    return cacheValue(normKey);
+    if (cacheKeyPersisted(normKey)) {
+        return cacheValue(normKey);
+    } else {
+        // Don't return possibly wrong cached values
+        // A key gets cached with the first default value requested and never changes afterwards
+        return def;
+    }
 }
 
+
 bool Settings::localKeyExists(const QString &key)
 {
     QString normKey = normalizedKey(group, key);
-    if (isCached(normKey))
-        return true;
+    if (!isKeyPersistedCached(normKey)) {
+        create_qsettings;
+        // Cache whether or not key exists on disk
+        // We can't cache key value as we don't know the default
+        setCacheKeyPersisted(normKey, s.contains(normKey));
+    }
 
-    create_qsettings;
-    return s.contains(normKey);
+    return cacheKeyPersisted(normKey);
 }
 
 
@@ -218,6 +236,13 @@ 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 (isKeyPersistedCached(normKey)) {
+        settingsKeyPersistedCache.remove(normKey);
+    }
+    if (hasNotifier(normKey)) {
+        emit notifier(normKey)->valueChanged({});
+    }
 }