do not call Start node on Sub Graph loaded from save

MothCocoon · Feb 22, 2022 · 4cb9ec2 · 4cb9ec2
1 parent d836e91
commit 4cb9ec2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/Source/Flow/Private/FlowSubsystem.cpp b/Source/Flow/Private/FlowSubsystem.cpp
@@ -101,14 +101,14 @@ void UFlowSubsystem::FinishRootFlow(UObject* Owner, const EFlowFinishPolicy Fini
 	}
 }
 
-UFlowAsset* UFlowSubsystem::CreateSubFlow(UFlowNode_SubGraph* SubGraphNode, const FString NewInstanceName, const bool bPreloading /* = false */)
+UFlowAsset* UFlowSubsystem::CreateSubFlow(UFlowNode_SubGraph* SubGraphNode, const FString SavedInstanceName, const bool bPreloading /* = false */)
 {
 	UFlowAsset* NewInstance = nullptr;
 
 	if (!InstancedSubFlows.Contains(SubGraphNode))
 	{
 		const TWeakObjectPtr<UObject> Owner = SubGraphNode->GetFlowAsset() ? SubGraphNode->GetFlowAsset()->GetOwner() : nullptr;
-		NewInstance = CreateFlowInstance(Owner, SubGraphNode->Asset, NewInstanceName);
+		NewInstance = CreateFlowInstance(Owner, SubGraphNode->Asset, SavedInstanceName);
 		InstancedSubFlows.Add(SubGraphNode, NewInstance);
 
 		if (bPreloading)
@@ -124,8 +124,12 @@ UFlowAsset* UFlowSubsystem::CreateSubFlow(UFlowNode_SubGraph* SubGraphNode, cons
 
 		AssetInstance->NodeOwningThisAssetInstance = SubGraphNode;
 		SubGraphNode->GetFlowAsset()->ActiveSubGraphs.Add(SubGraphNode, AssetInstance);
-
-		AssetInstance->StartFlow();
+
+		// don't activate Start Node if we're loading Sub Graph from SaveGame
+		if (SavedInstanceName.IsEmpty())
+		{
+			AssetInstance->StartFlow();
+		}
 	}
 
 	return NewInstance;
@@ -221,7 +225,7 @@ void UFlowSubsystem::OnGameSaved(UFlowSaveGame* SaveGame)
 	TArray<TWeakObjectPtr<UFlowComponent>> ComponentsArray;
 	FlowComponentRegistry.GenerateValueArray(ComponentsArray);
 	const TSet<TWeakObjectPtr<UFlowComponent>> FlowComponents = TSet<TWeakObjectPtr<UFlowComponent>>(ComponentsArray);
-	for (TWeakObjectPtr<UFlowComponent> FlowComponent : FlowComponents)
+	for (const TWeakObjectPtr<UFlowComponent> FlowComponent : FlowComponents)
 	{
 		SaveGame->FlowComponents.Emplace(FlowComponent->SaveInstance());
 	}

diff --git a/Source/Flow/Public/FlowSubsystem.h b/Source/Flow/Public/FlowSubsystem.h
@@ -70,7 +70,7 @@ class FLOW_API UFlowSubsystem : public UGameInstanceSubsystem
 	void FinishRootFlow(UObject* Owner, const EFlowFinishPolicy FinishPolicy);
 
 private:
-	UFlowAsset* CreateSubFlow(UFlowNode_SubGraph* SubGraphNode, const FString NewInstanceName = FString(), const bool bPreloading = false);
+	UFlowAsset* CreateSubFlow(UFlowNode_SubGraph* SubGraphNode, const FString SavedInstanceName = FString(), const bool bPreloading = false);
 	void RemoveSubFlow(UFlowNode_SubGraph* SubGraphNode, const EFlowFinishPolicy FinishPolicy);
 
 	UFlowAsset* CreateFlowInstance(const TWeakObjectPtr<UObject> Owner, TSoftObjectPtr<UFlowAsset> FlowAsset, FString NewInstanceName = FString());