From f9ca8b4106970b291740a0b8cf4dc916d365ed34 Mon Sep 17 00:00:00 2001 From: pyi Date: Fri, 19 Jun 2026 13:24:20 +0200 Subject: [PATCH] Fixed CreateSubFlow returning nullptr if instance was preloaded --- Source/Flow/Private/FlowSubsystem.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/Flow/Private/FlowSubsystem.cpp b/Source/Flow/Private/FlowSubsystem.cpp index 65c49e9b..c2996aa9 100644 --- a/Source/Flow/Private/FlowSubsystem.cpp +++ b/Source/Flow/Private/FlowSubsystem.cpp @@ -164,23 +164,23 @@ void UFlowSubsystem::FinishAllRootFlows(UObject* Owner, const EFlowFinishPolicy UFlowAsset* UFlowSubsystem::CreateSubFlow(UFlowNode_SubGraph* SubGraphNode, const FString& SavedInstanceName, const bool bPreloading /* = false */) { - UFlowAsset* NewInstance = nullptr; + UFlowAsset* AssetInstance = nullptr; if (!InstancedSubFlows.Contains(SubGraphNode)) { const TWeakObjectPtr Owner = SubGraphNode->GetFlowAsset() ? SubGraphNode->GetFlowAsset()->GetOwner() : nullptr; - NewInstance = CreateFlowInstance(Owner, SubGraphNode->Asset.LoadSynchronous(), SavedInstanceName); + AssetInstance = CreateFlowInstance(Owner, SubGraphNode->Asset.LoadSynchronous(), SavedInstanceName); - if (NewInstance) + if (AssetInstance) { - InstancedSubFlows.Add(SubGraphNode, NewInstance); + InstancedSubFlows.Add(SubGraphNode, AssetInstance); } } if (InstancedSubFlows.Contains(SubGraphNode) && !bPreloading) { // get instanced asset from map - in case it was already instanced by calling CreateSubFlow() with bPreloading == true - UFlowAsset* AssetInstance = InstancedSubFlows[SubGraphNode]; + AssetInstance = InstancedSubFlows[SubGraphNode]; AssetInstance->NodeOwningThisAssetInstance = SubGraphNode; SubGraphNode->GetFlowAsset()->ActiveSubGraphs.Add(SubGraphNode, AssetInstance); @@ -192,7 +192,7 @@ UFlowAsset* UFlowSubsystem::CreateSubFlow(UFlowNode_SubGraph* SubGraphNode, cons } } - return NewInstance; + return AssetInstance; } void UFlowSubsystem::RemoveSubFlow(UFlowNode_SubGraph* SubGraphNode, const EFlowFinishPolicy FinishPolicy)