mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-04 18:51:17 -06:00
Code Issues Packages Projects Releases Wiki Activity

Read DefaultAccess parameter from the configuration file correctly

Browse Source
This commit is contained in:
Alexander Bock
2019-05-22 22:28:30 -06:00
parent 01628578eb
commit 92cb443205
2 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
modules/server/servermodule.cpp
View File

@@ -72,37 +72,30 @@ ServerInterface* ServerModule::serverInterfaceByIdentifier(const std::string& id
}
void ServerModule::internalInitialize(const ghoul::Dictionary& configuration) {
using namespace ghoul::io;
global::callback::preSync.emplace_back([this]() { preSync(); });
if (configuration.hasValue<ghoul::Dictionary>(KeyInterfaces)) {
ghoul::Dictionary interfaces =
configuration.value<ghoul::Dictionary>(KeyInterfaces);
if (!configuration.hasValue<ghoul::Dictionary>(KeyInterfaces)) {
return;
}
ghoul::Dictionary interfaces = configuration.value<ghoul::Dictionary>(KeyInterfaces);
for (std::string& key : interfaces.keys()) {
if (!interfaces.hasValue<ghoul::Dictionary>(key)) {
continue;
}
ghoul::Dictionary interfaceDictionary =
interfaces.value<ghoul::Dictionary>(key);
for (const std::string& key : interfaces.keys()) {
ghoul::Dictionary interfaceDictionary = interfaces.value<ghoul::Dictionary>(key);
std::unique_ptr<ServerInterface> serverInterface =
ServerInterface::createFromDictionary(interfaceDictionary);
std::unique_ptr<ServerInterface> serverInterface =
ServerInterface::createFromDictionary(interfaceDictionary);
if (global::windowDelegate.isMaster()) {
serverInterface->initialize();
}
_interfaceOwner.addPropertySubOwner(serverInterface.get());
if (serverInterface) {
_interfaces.push_back(std::move(serverInterface));
}
if (global::windowDelegate.isMaster()) {
serverInterface->initialize();
}
}
_interfaceOwner.addPropertySubOwner(serverInterface.get());
global::callback::preSync.emplace_back([this]() { preSync(); });
if (serverInterface) {
_interfaces.push_back(std::move(serverInterface));
}
}
}
void ServerModule::preSync() {