Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 18:50:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix unlock of locker not mutex, don't pack permission defaults

Browse source
This commit is contained in:
Stephen Birarda 2018-02-16 14:34:54 -08:00
parent 679513599c
commit dd5b08bdc1
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -686,9 +686,6 @@ void DomainServerSettingsManager::unpackPermissions() {
// add the permissions to the standard map // add the permissions to the standard map
_standardAgentPermissions[standardKey] = perms; _standardAgentPermissions[standardKey] = perms;
// this will require a packing of permissions
needPack = true;
} }
} }
@ -1080,7 +1077,7 @@ QVariant DomainServerSettingsManager::valueOrDefaultValueForKeyPath(const QStrin
return *foundValue; return *foundValue;
} else { } else {
// we don't need the settings lock anymore since we're done reading from the config map // we don't need the settings lock anymore since we're done reading from the config map
_settingsLock.unlock(); locker.unlock();
int dotIndex = keyPath.indexOf('.'); int dotIndex = keyPath.indexOf('.');