Merge pull request #9676 from birarda/bug/remove-domain-open-hours

fix empty descriptors map bug in DS
This commit is contained in:
Howard Stearns 2017-02-14 16:02:54 -08:00 committed by GitHub
commit 3e52091dee

View file

@ -299,7 +299,14 @@ void DomainServerSettingsManager::setupConfigMap(const QStringList& argumentList
}
QVariantMap& DomainServerSettingsManager::getDescriptorsMap() {
static const QString DESCRIPTORS{ "descriptors" };
auto& settingsMap = getSettingsMap();
if (!getSettingsMap().contains(DESCRIPTORS)) {
settingsMap.insert(DESCRIPTORS, QVariantMap());
}
return *static_cast<QVariantMap*>(getSettingsMap()[DESCRIPTORS].data());
}