mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-05-19 02:18:50 -05:00
Feature/globals handling (#1352)
* Cleaner handling of global state * Prevent Lua memory corruption (closes #982) * Initialize glfw first thing to prevent weird joystick loading bug during startup
This commit is contained in:
@@ -100,7 +100,7 @@ void ServerModule::internalInitialize(const ghoul::Dictionary& configuration) {
|
||||
ServerInterface::createFromDictionary(interfaceDictionary);
|
||||
|
||||
|
||||
if (global::windowDelegate.isMaster()) {
|
||||
if (global::windowDelegate->isMaster()) {
|
||||
serverInterface->initialize();
|
||||
}
|
||||
|
||||
@@ -113,7 +113,7 @@ void ServerModule::internalInitialize(const ghoul::Dictionary& configuration) {
|
||||
}
|
||||
|
||||
void ServerModule::preSync() {
|
||||
if (!global::windowDelegate.isMaster()) {
|
||||
if (!global::windowDelegate->isMaster()) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -185,7 +185,7 @@ void ServerModule::disconnectAll() {
|
||||
ZoneScoped
|
||||
|
||||
for (std::unique_ptr<ServerInterface>& serverInterface : _interfaces) {
|
||||
if (global::windowDelegate.isMaster()) {
|
||||
if (global::windowDelegate->isMaster()) {
|
||||
serverInterface->deinitialize();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user