Skip to content
Snippets Groups Projects
Commit 64922ff4 authored by Ehret's avatar Ehret
Browse files

fix loading/getting of cluster manager if DisplayCluster module was not loaded yet

parent f5206926
Branches
Tags
1 merge request!7fix loading/getting of cluster manager if DisplayCluster module was not loaded yet
......@@ -25,8 +25,8 @@ void FCalibratioModule::StartupModule ()
/* Register cluster event listening */
IDisplayClusterClusterManager* ClusterManager = IDisplayCluster::Get().GetClusterMgr();
if (ClusterManager && !ClusterEventListenerDelegate.IsBound())
IDisplayCluster* DisplayCluster = FModuleManager::LoadModulePtr<IDisplayCluster>(IDisplayCluster::ModuleName);
if (DisplayCluster && !ClusterEventListenerDelegate.IsBound())
{
ClusterEventListenerDelegate = FOnClusterEventJsonListener::CreateLambda([](const FDisplayClusterClusterEventJson& Event)
{
......@@ -35,7 +35,7 @@ void FCalibratioModule::StartupModule ()
SpawnCalibratio();
}
});
ClusterManager->AddClusterEventJsonListener(ClusterEventListenerDelegate);
DisplayCluster->GetClusterMgr()->AddClusterEventJsonListener(ClusterEventListenerDelegate);
}
}
void FCalibratioModule::ShutdownModule()
......
......@@ -21,8 +21,8 @@ void FClusterConsole::Register()
}));
/* Register cluster event handling */
IDisplayClusterClusterManager* ClusterManager = IDisplayCluster::Get().GetClusterMgr();
if (ClusterManager && !ClusterEventListenerDelegate.IsBound())
IDisplayCluster* DisplayCluster = FModuleManager::LoadModulePtr<IDisplayCluster>(IDisplayCluster::ModuleName);
if (DisplayCluster && !ClusterEventListenerDelegate.IsBound())
{
ClusterEventListenerDelegate = FOnClusterEventJsonListener::CreateLambda([](const FDisplayClusterClusterEventJson& Event)
{
......@@ -32,7 +32,7 @@ void FClusterConsole::Register()
GEngine->Exec(GEngine->GetCurrentPlayWorld(), *Event.Parameters["Command"]);
}
});
ClusterManager->AddClusterEventJsonListener(ClusterEventListenerDelegate);
DisplayCluster->GetClusterMgr()->AddClusterEventJsonListener(ClusterEventListenerDelegate);
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment