Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-24 09:43:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #12465 from birarda/feat/content-settings

Browse source 
fix restore of object settings for content or domain settings
This commit is contained in:
Clément Brisset 2018-02-21 18:15:09 -08:00 committed by GitHub
commit 8f7944522f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
domain-server/src/DomainServerSettingsManager.cpp
View file

@ -1298,6 +1298,9 @@ bool DomainServerSettingsManager::restoreSettingsFromObject(QJsonObject settings
}
} else {
// we have a value to restore, use update setting to set it
// but clear the existing value first so that no merging between the restored settings
// and existing settings occurs
variantValue->clear();
// we might need to re-grab config group map in case it didn't exist when we looked for it before
// but was created by the call to valueForKeyPath before