fixed case where Root Flow wouldn't be properly finished and cleaned up

bug reported and fixed by BorMor
MothCocoon · Dec 19, 2021 · eb398d3 · eb398d3
1 parent eb6233d
commit eb398d3
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/Source/Flow/Private/FlowAsset.cpp b/Source/Flow/Private/FlowAsset.cpp
@@ -412,9 +412,16 @@ void UFlowAsset::FinishNode(UFlowNode* Node)
 		ActiveNodes.Remove(Node);
 
 		// if graph reached Finish and this asset instance was created by SubGraph node
-		if (Node->GetClass()->IsChildOf(UFlowNode_Finish::StaticClass()) && NodeOwningThisAssetInstance.IsValid())
+		if (Node->GetClass()->IsChildOf(UFlowNode_Finish::StaticClass()))
 		{
-			NodeOwningThisAssetInstance.Get()->TriggerFirstOutput(true);
+			if (NodeOwningThisAssetInstance.IsValid())
+			{
+				NodeOwningThisAssetInstance.Get()->TriggerFirstOutput(true);
+			}
+			else
+			{
+				FinishFlow(EFlowFinishPolicy::Keep);
+			}
 		}
 	}
 }