Skip to content
Snippets Groups Projects

Fix/cluster event wrapper

Merged Jonathan Ehret requested to merge fix/cluster-event-wrapper into dev/5.3
1 file
+ 8
8
Compare changes
  • Side-by-side
  • Inline
@@ -29,9 +29,9 @@ public:
checkf(Object == nullptr, TEXT("The event is already attached."));
Object = NewObject;
ObjectId = Object->GetUniqueID();
ObjectName = Object->GetFullName();
UE_LOG(LogTemp, Warning, TEXT("[DisplayClusterEventWrapper] Object UniqueID: %d."), ObjectId)
UE_LOG(LogTemp, Warning, TEXT("[DisplayClusterEventWrapper] Object name: %s and method name %s."), *ObjectName, *MethodName)
EDisplayClusterOperationMode OperationMode = IDisplayCluster::Get().GetOperationMode();
if (OperationMode == EDisplayClusterOperationMode::Cluster)
@@ -50,13 +50,13 @@ public:
FMemoryReader MemoryReader(Event.EventData);
uint32 EventObjectId;
FString EventObjectName;
// This reads the value!
MemoryReader << EventObjectId;
if (EventObjectId != ObjectId)
MemoryReader << EventObjectName;
if (EventObjectName != ObjectName)
{
// Event does not belong to this object.
UE_LOG(LogTemp, Warning, TEXT("[DisplayClusterEventWrapper] Event does not belong to this object %d vs %d (this object)."), EventObjectId, ObjectId)
UE_LOG(LogTemp, Warning, TEXT("[DisplayClusterEventWrapper] Event does not belong to this object %s vs %s (this object)."), *EventObjectName, *ObjectName)
return;
}
@@ -122,7 +122,7 @@ public:
ClusterEvent.bShouldDiscardOnRepeat = false;
FMemoryWriter MemoryWriter(ClusterEvent.EventData);
MemoryWriter << ObjectId;
MemoryWriter << const_cast<FString&>(ObjectName);
MemoryWriter << const_cast<FString&>(MethodName);
SerializeParameters(&MemoryWriter, Forward<ArgTypes>(Arguments)...);
@@ -134,7 +134,7 @@ public:
private:
const FString MethodName;
uint32 ObjectId;
FString ObjectName;
ObjectType* Object = nullptr;
FOnClusterEventBinaryListener ClusterEventListenerDelegate;
};
Loading