Fix leaking FreePIEInstances

slonopotamus · Aug 23, 2024 · db72889 · db72889
1 parent 6ab87bf
commit db72889
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/Source/UEST/Private/ScopedGame.cpp b/Source/UEST/Private/ScopedGame.cpp
@@ -247,6 +247,11 @@ UGameInstance* FScopedGameInstance::CreateClientFor(const UGameInstance* Server,
 
 void FScopedGameInstance::DestroyGameInternal(UGameInstance& Game)
 {
+	if (const auto* WorldContext = Game.GetWorldContext())
+	{
+		FreePIEInstances.Push(WorldContext->PIEInstance);
+	}
+
 	const auto OnlineSubsystemId = UOnlineEngineInterface::Get()->GetOnlineIdentifier(*Game.GetWorldContext());
 	const auto World = Game.GetWorld();
 	World->BeginTearingDown();
@@ -294,11 +299,6 @@ bool FScopedGameInstance::DestroyGame(UGameInstance* Game)
 			continue;
 		}
 
-		if (const auto* WorldContext = Game->GetWorldContext())
-		{
-			FreePIEInstances.Push(WorldContext->PIEInstance);
-		}
-
 		DestroyGameInternal(*Game);
 		Games.RemoveAt(Index);