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

This commit is contained in:
Stephen Birarda 2018-02-16 14:34:54 -08:00
parent 679513599c
commit dd5b08bdc1

View file

@ -686,9 +686,6 @@ void DomainServerSettingsManager::unpackPermissions() {
// add the permissions to the standard map
_standardAgentPermissions[standardKey] = perms;
// this will require a packing of permissions
needPack = true;
}
}
@ -1080,7 +1077,7 @@ QVariant DomainServerSettingsManager::valueOrDefaultValueForKeyPath(const QStrin
return *foundValue;
} else {
// 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('.');