Skip to content

Commit 3f3c665

Browse files
committed
Don't try to use MessageLog in Standalone, it only throws error to log
1 parent 284dcab commit 3f3c665

File tree

3 files changed

+21
-12
lines changed

3 files changed

+21
-12
lines changed

Source/Flow/Private/Nodes/FlowNodeBase.cpp

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -701,7 +701,7 @@ FText UFlowNodeBase::GetNodeToolTip() const
701701
return FText::FromString(BlueprintTitle);
702702
}
703703
}
704-
704+
705705

706706
return GetClass()->GetToolTipText();
707707
}
@@ -714,20 +714,20 @@ FText UFlowNodeBase::GetNodeConfigText() const
714714
FText UFlowNodeBase::GetGeneratedDisplayName() const
715715
{
716716
static const FName NAME_GeneratedDisplayName(TEXT("GeneratedDisplayName"));
717-
717+
718718
if (GetClass()->ClassGeneratedBy)
719719
{
720720
UClass* Class = Cast<UBlueprint>(GetClass()->ClassGeneratedBy)->GeneratedClass;
721721
return Class->GetMetaDataText(NAME_GeneratedDisplayName);
722722
}
723-
723+
724724
return GetClass()->GetMetaDataText(NAME_GeneratedDisplayName);
725725
}
726726

727727
void UFlowNodeBase::EnsureNodeDisplayStyle()
728728
{
729729
// todo: remove in Flow 2.1
730-
730+
731731
// Backward compatibility update to convert NodeStyle to NodeDisplayStyle
732732
FLOW_ASSERT_ENUM_MAX(EFlowNodeStyle, 7);
733733

@@ -832,9 +832,12 @@ void UFlowNodeBase::LogError(FString Message, const EFlowOnScreenMessageType OnS
832832
// Output Log
833833
UE_LOG(LogFlow, Error, TEXT("%s"), *Message);
834834

835-
// Message Log
836835
#if WITH_EDITOR
837-
GetFlowAsset()->GetTemplateAsset()->LogError(Message, this);
836+
if (GEditor)
837+
{
838+
// Message Log
839+
GetFlowAsset()->GetTemplateAsset()->LogError(Message, this);
840+
}
838841
#endif
839842
}
840843
#endif
@@ -848,9 +851,12 @@ void UFlowNodeBase::LogWarning(FString Message) const
848851
// Output Log
849852
UE_LOG(LogFlow, Warning, TEXT("%s"), *Message);
850853

851-
// Message Log
852854
#if WITH_EDITOR
853-
GetFlowAsset()->GetTemplateAsset()->LogWarning(Message, this);
855+
if (GEditor)
856+
{
857+
// Message Log
858+
GetFlowAsset()->GetTemplateAsset()->LogWarning(Message, this);
859+
}
854860
#endif
855861
}
856862
#endif
@@ -864,9 +870,12 @@ void UFlowNodeBase::LogNote(FString Message) const
864870
// Output Log
865871
UE_LOG(LogFlow, Log, TEXT("%s"), *Message);
866872

867-
// Message Log
868873
#if WITH_EDITOR
869-
GetFlowAsset()->GetTemplateAsset()->LogNote(Message, this);
874+
if (GEditor)
875+
{
876+
// Message Log
877+
GetFlowAsset()->GetTemplateAsset()->LogNote(Message, this);
878+
}
870879
#endif
871880
}
872881
#endif

Source/Flow/Public/FlowMessageLog.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ class FLOW_API FFlowMessageLog
8181

8282
protected:
8383
template <typename T>
84-
void AddMessage(FName MessageID, const TCHAR* Format, TSharedRef<FTokenizedMessage>& Message, T* Object)
84+
void AddMessage(const FName MessageID, const TCHAR* Format, TSharedRef<FTokenizedMessage>& Message, T* Object)
8585
{
8686
Message->SetIdentifier(MessageID);
8787

Source/Flow/Public/Nodes/FlowNodeBase.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ class FLOW_API UFlowNodeBase
272272

273273
UPROPERTY()
274274
TObjectPtr<UEdGraphNode> GraphNode;
275-
275+
276276
#if WITH_EDITORONLY_DATA
277277
protected:
278278
UPROPERTY(EditDefaultsOnly, Category = "FlowNode")

0 commit comments

Comments
 (0)