Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-29 22:22:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing settings, even in release builds

Browse source
This commit is contained in:
Bradley Austin Davis 2016-06-14 12:13:27 -07:00
parent d52a1fe6f9
commit b1c472e82b
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/shared/src/SettingHandle.h
View file

@ -97,7 +97,7 @@ namespace Setting {
void set(const T& value) { void set(const T& value) {
maybeInit(); maybeInit();
if (_value != value) { if ((!_isSet && (value != _defaultValue)) || _value != value) {
_value = value; _value = value;
_isSet = true; _isSet = true;
save(); save();

7
libraries/shared/src/SettingManager.cpp
View file

@ -96,6 +96,7 @@ namespace Setting {
} }
void Manager::saveAll() { void Manager::saveAll() {
bool forceSync = false;
withWriteLock([&] { withWriteLock([&] {
for (auto key : _pendingChanges.keys()) { for (auto key : _pendingChanges.keys()) {
auto newValue = _pendingChanges[key]; auto newValue = _pendingChanges[key];
@ -104,14 +105,20 @@ namespace Setting {
continue; continue;
} }
if (newValue == UNSET_VALUE || !newValue.isValid()) { if (newValue == UNSET_VALUE || !newValue.isValid()) {
forceSync = true;
remove(key); remove(key);
} else { } else {
forceSync = true;
setValue(key, newValue); setValue(key, newValue);
} }
} }
_pendingChanges.clear(); _pendingChanges.clear();
}); });
if (forceSync) {
sync();
}
// Restart timer // Restart timer
if (_saveTimer) { if (_saveTimer) {
_saveTimer->start(); _saveTimer->start();