Ensuring coroutine handles are valid before resuming them. Fixed badly

passed action handled to coroutine handlers.
zompi2 · Aug 1, 2024 · b94a2e9 · b94a2e9
1 parent e299343
commit b94a2e9
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 6 deletions.
diff --git a/Source/EnhancedCodeFlow/Public/CodeFlowActions/Coroutines/ECFRunAsyncAndWait.h b/Source/EnhancedCodeFlow/Public/CodeFlowActions/Coroutines/ECFRunAsyncAndWait.h
@@ -100,7 +100,10 @@ class ENHANCEDCODEFLOW_API UECFRunAsyncAndWait: public UECFCoroutineActionBase
 
 	void Complete(bool bStopped) override
 	{
-		CoroutineHandle.resume();
+		if (bHasValidCoroutineHandle)
+		{
+			CoroutineHandle.resume();
+		}
 	}
 };
 

diff --git a/Source/EnhancedCodeFlow/Public/CodeFlowActions/Coroutines/ECFWaitSeconds.h b/Source/EnhancedCodeFlow/Public/CodeFlowActions/Coroutines/ECFWaitSeconds.h
@@ -58,7 +58,10 @@ class ENHANCEDCODEFLOW_API UECFWaitSeconds : public UECFCoroutineActionBase
 
 	void Complete(bool bStopped) override
 	{
-		CoroutineHandle.resume();
+		if (bHasValidCoroutineHandle)
+		{
+			CoroutineHandle.resume();
+		}
 	}
 };
 

diff --git a/Source/EnhancedCodeFlow/Public/CodeFlowActions/Coroutines/ECFWaitTicks.h b/Source/EnhancedCodeFlow/Public/CodeFlowActions/Coroutines/ECFWaitTicks.h
@@ -54,7 +54,10 @@ class ENHANCEDCODEFLOW_API UECFWaitTicks : public UECFCoroutineActionBase
 
 	void Complete(bool bStopped) override
 	{
-		CoroutineHandle.resume();
+		if (bHasValidCoroutineHandle)
+		{
+			CoroutineHandle.resume();
+		}
 	}
 };
 

diff --git a/Source/EnhancedCodeFlow/Public/CodeFlowActions/Coroutines/ECFWaitUntil.h b/Source/EnhancedCodeFlow/Public/CodeFlowActions/Coroutines/ECFWaitUntil.h
@@ -75,7 +75,10 @@ class ENHANCEDCODEFLOW_API UECFWaitUntil : public UECFCoroutineActionBase
 
 	void Complete(bool bStopped) override
 	{
-		CoroutineHandle.resume();
+		if (bHasValidCoroutineHandle)
+		{
+			CoroutineHandle.resume();
+		}
 	}
 };
 

diff --git a/Source/EnhancedCodeFlow/Public/Coroutines/ECFCoroutineActionBase.h b/Source/EnhancedCodeFlow/Public/Coroutines/ECFCoroutineActionBase.h
@@ -24,6 +24,7 @@ class ENHANCEDCODEFLOW_API UECFCoroutineActionBase : public UECFActionBase
 		if (bHasValidCoroutineHandle)
 		{
 			CoroutineHandle.destroy();
+			bHasValidCoroutineHandle = false;
 		}
 		Super::BeginDestroy();
 	}
@@ -33,15 +34,15 @@ class ENHANCEDCODEFLOW_API UECFCoroutineActionBase : public UECFActionBase
 	// Coroutine handle used to control the coroutine inside the Action.
 	FECFCoroutineHandle CoroutineHandle;
 
-	// 
+	// Flag indicating if the coroutine handle is valid and safe to be destroyed.
 	bool bHasValidCoroutineHandle = false;
 
 private:
 
 	// Setting up action. The same as in ActionBase, but it additionally sets the coroutine handle.
 	void SetCoroutineAction(const UObject* InOwner, FECFCoroutineHandle InCoroutineHandle, const FECFHandle& InHandleId, const FECFActionSettings& InSettings)
 	{
-		UECFActionBase::SetAction(InOwner, HandleId, {}, InSettings);
+		UECFActionBase::SetAction(InOwner, InHandleId, {}, InSettings);
 		CoroutineHandle = InCoroutineHandle;
 		bHasValidCoroutineHandle = true;
 	}