Skip to content

Fixed CreateSubFlow returning nullptr if instance was preloaded #385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CyaDaPaKnat wants to merge 1 commit into
base: 5.x
Choose a base branch
from
+6 −6
Open

Fixed CreateSubFlow returning nullptr if instance was preloaded #385

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Source/Flow/Private/FlowSubsystem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<UObject> 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);
Expand All @@ -192,7 +192,7 @@ UFlowAsset* UFlowSubsystem::CreateSubFlow(UFlowNode_SubGraph* SubGraphNode, cons
}
}

return NewInstance;
return AssetInstance;
}

void UFlowSubsystem::RemoveSubFlow(UFlowNode_SubGraph* SubGraphNode, const EFlowFinishPolicy FinishPolicy)
Expand Down