Merge branch 'fix/display-cluster-loading' into '4.26'

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

See merge request VR-Group/unreal-development/plugins/rwth-vr-toolkit!7

Source/Calibratio/Private/Calibratio.cpp

@@ -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()

Source/RWTHVRToolkit/Private/Cluster/ClusterConsole.cpp

@@ -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);
 	}
 }