projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
client: Fix settings upgrade missing some steps
[quassel.git]
/
src
/
common
/
settings.cpp
diff --git
a/src/common/settings.cpp
b/src/common/settings.cpp
index
2d79ffe
..
6273f7c
100644
(file)
--- a/
src/common/settings.cpp
+++ b/
src/common/settings.cpp
@@
-207,9
+207,8
@@
const QVariant &Settings::localValue(const QString &key, const QVariant &def)
bool Settings::localKeyExists(const QString &key)
{
QString normKey = normalizedKey(group, key);
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);
}
create_qsettings;
return s.contains(normKey);
}