Make GWorld checks stricter

landelare · Nov 12, 2024 · 092b352 · 092b352
1 parent 883997b
commit 092b352
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/Source/UE5Coro/Private/LatentAwaiter.cpp b/Source/UE5Coro/Private/LatentAwaiter.cpp
@@ -119,8 +119,8 @@ void FLatentAwaiter::Suspend(FAsyncPromise& Promise)
 {
 	checkf(IsInGameThread(),
 	       TEXT("Latent awaiters may only be used on the game thread"));
-	checkf(GWorld,
-	       TEXT("Awaiting this can only be done in the context of a world"));
+	checkf(::IsValid(GWorld),
+	       TEXT("Awaiting this can only be done in the context of a valid world"));
 
 	// Prepare a latent action on the subsystem and transfer ownership to that
 	auto* Sys = GWorld->GetSubsystem<UUE5CoroSubsystem>();

diff --git a/Source/UE5Coro/Private/LatentAwaiters_Wait.cpp b/Source/UE5Coro/Private/LatentAwaiters_Wait.cpp
@@ -52,7 +52,8 @@ bool WaitUntilTime(void* State, bool bCleanup)
 		return false;
 
 	auto& TargetTime = reinterpret_cast<double&>(State);
-	checkf(GWorld, TEXT("Internal error: latent poll outside of a world"));
+	checkf(IsValid(GWorld),
+	       TEXT("Internal error: latent poll outside of a valid world"));
 	return (GWorld->*GetTime)() >= TargetTime;
 }
 
@@ -79,8 +80,8 @@ FLatentAwaiter GenericUntil(double Time)
 #endif
 	checkf(IsInGameThread(),
 	       TEXT("Latent awaiters may only be used on the game thread"));
-	checkf(GWorld,
-	       TEXT("This function may only be used in the context of a world"));
+	checkf(IsValid(GWorld),
+	       TEXT("This function may only be used in the context of a valid world"));
 
 	if constexpr (bTimeIsOffset)
 		Time += (GWorld->*GetTime)();

diff --git a/Source/UE5Coro/Private/LatentChain.cpp b/Source/UE5Coro/Private/LatentChain.cpp
@@ -37,7 +37,7 @@ using namespace UE5Coro::Private;
 
 std::tuple<FLatentActionInfo, FTwoLives*> Private::MakeLatentInfo()
 {
-	checkf(GWorld, TEXT("Internal error: unguarded world access"));
+	checkf(IsValid(GWorld), TEXT("Internal error: unguarded world access"));
 	auto* Sys = GWorld->GetSubsystem<UUE5CoroSubsystem>();
 	// Will be Released by the FLatentAwaiter from the caller
 	// and UUE5CoroSubsystem on the latent action's completion.

diff --git a/Source/UE5Coro/Public/UE5Coro/LatentChain.inl b/Source/UE5Coro/Public/UE5Coro/LatentChain.inl
@@ -87,7 +87,8 @@ struct FLatentChain<true, bInfo, Type, Types...>
 {
 	static void Call(auto&& Fn, FLatentActionInfo LatentInfo, auto&&... Args)
 	{
-		checkf(GWorld, TEXT("Could not chain latent action: no world found"));
+		checkf(IsValid(GWorld),
+		       TEXT("Could not chain latent action: no valid world found"));
 		FLatentChain<false, bInfo, Types...>::Call(
 			std::bind_front(std::forward<decltype(Fn)>(Fn), &*GWorld),
 			std::move(LatentInfo),
@@ -165,8 +166,8 @@ Private::FLatentChainAwaiter ChainEx(auto&& Function, auto&&... Args)
 	checkf(IsInGameThread(),
 	       TEXT("Latent awaiters may only be used on the game thread"));
 	if constexpr ((... || (std::is_placeholder_v<std::decay_t<decltype(Args)>> == 1)))
-		checkf(GWorld,
-		       TEXT("Could not chain latent action: no world found for _1"));
+		checkf(IsValid(GWorld),
+		       TEXT("Could not chain latent action: no valid world found for _1"));
 	static_assert((... || (std::is_placeholder_v<std::decay_t<decltype(Args)>> == 2)),
 	              "The _2 parameter for LatentInfo is mandatory");
 

diff --git a/UE5Coro.uplugin b/UE5Coro.uplugin
@@ -1,7 +1,7 @@
 {
 	"FileVersion": 3,
 	"Version": 1,
-	"VersionName": "2.0",
+	"VersionName": "2.0.1-RC",
 	"FriendlyName": "UE5Coro",
 	"Description": "C++20 coroutine implementation for Unreal Engine",
 	"Category": "Programming",
@@ -13,7 +13,7 @@
 	"EnabledByDefault": true,
 	"CanContainContent": false,
 	"CanContainVerse": false,
-	"IsBetaVersion": false,
+	"IsBetaVersion": true,
 	"IsExperimentalVersion": false,
 	"Installed": false,
 	"Modules": [