Fixed crash on 'stop' simulation button with dirty assets

JanSeliv · Dec 29, 2023 · 699fd08 · 699fd08
1 parent fa511d5
commit 699fd08
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 16 deletions.
diff --git a/Binaries/Win64/UnrealEditor-PoolManager.dll b/Binaries/Win64/UnrealEditor-PoolManager.dll
diff --git a/Binaries/Win64/UnrealEditor-PoolManager.pdb b/Binaries/Win64/UnrealEditor-PoolManager.pdb
diff --git a/Source/PoolManager/Private/PoolManagerSubsystem.cpp b/Source/PoolManager/Private/PoolManagerSubsystem.cpp
@@ -25,26 +25,21 @@ UPoolManagerSubsystem* UPoolManagerSubsystem::GetPoolManagerByClass(TSubclassOf<
 		OptionalClass = StaticClass();
 	}
 
-	const UWorld* FoundWorld = OptionalWorldContext
-		                           ? GEngine->GetWorldFromContextObject(OptionalWorldContext, EGetWorldErrorMode::Assert)
-		                           : GEngine->GetCurrentPlayWorld();
-
+	const UWorld* World = OptionalWorldContext
+		                      ? GEngine->GetWorldFromContextObject(OptionalWorldContext, EGetWorldErrorMode::ReturnNull)
+		                      : GEngine->GetCurrentPlayWorld();
 #if WITH_EDITOR
-	if (!FoundWorld && GEditor)
-	{
-		// If world is not found, most likely a game did not start yet and we are in editor
-		const FWorldContext& WorldContext = GEditor->IsPlaySessionInProgress() ? *GEditor->GetPIEWorldContext() : GEditor->GetEditorWorldContext();
-		FoundWorld = WorldContext.World();
-	}
-#endif // WITH_EDITOR
-
-	if (!ensureMsgf(FoundWorld, TEXT("%s: Can not obtain current world"), *FString(__FUNCTION__)))
+	if (!World && GIsEditor && GEditor)
 	{
-		return nullptr;
+		World = GEditor->IsPlaySessionInProgress()
+			        ? (GEditor->GetCurrentPlayWorld() ? GEditor->GetCurrentPlayWorld() : (GEditor->GetPIEWorldContext() ? GEditor->GetPIEWorldContext()->World() : nullptr))
+			        : GEditor->GetEditorWorldContext().World();
+		World = World ? World : GWorld;
 	}
+#endif
 
-	UPoolManagerSubsystem* FoundPoolManager = Cast<UPoolManagerSubsystem>(FoundWorld->GetSubsystemBase(OptionalClass));
-	if (!ensureMsgf(FoundPoolManager, TEXT("%s: 'Can not find Pool Manager for %s class in %s world"), *FString(__FUNCTION__), *OptionalClass->GetName(), *FoundWorld->GetName()))
+	UPoolManagerSubsystem* FoundPoolManager = World ? Cast<UPoolManagerSubsystem>(World->GetSubsystemBase(OptionalClass)) : nullptr;
+	if (!ensureMsgf(FoundPoolManager, TEXT("%s: 'Can not find Pool Manager for %s class in %s world"), *FString(__FUNCTION__), *OptionalClass->GetName(), *World->GetName()))
 	{
 		return nullptr;
 	}