From fa9def4dd74b931d5008bc5cf362ab67d0b4251d Mon Sep 17 00:00:00 2001
From: Thomas Nordquist <thomas.nordquist@viison.com>
Date: Sun, 20 Jan 2019 12:29:00 +0100
Subject: [PATCH] Fix mqttMessage merge

---
 app/src/actions/Publish.ts    | 7 ++++---
 backend/src/Model/TreeNode.ts | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/actions/Publish.ts b/app/src/actions/Publish.ts
index a4eb339..fab8f20 100644
--- a/app/src/actions/Publish.ts
+++ b/app/src/actions/Publish.ts
@@ -46,12 +46,13 @@ export const publish = (connectionId: string) => (dispatch: Dispatch<Action>, ge
   }
 
   const publishEvent = makePublishEvent(connectionId)
-  rendererEvents.emit(publishEvent, {
+  const mqttMessage = {
     topic,
-    payload: state.publish.payload,
+    payload: state.publish.emptyPayload ? null : state.publish.payload,
     retain: state.publish.retain,
     qos: state.publish.qos,
-  })
+  }
+  rendererEvents.emit(publishEvent, mqttMessage)
 }
 
 export const toggleRetain = (): Action => {
diff --git a/backend/src/Model/TreeNode.ts b/backend/src/Model/TreeNode.ts
index f868d73..9093b06 100644
--- a/backend/src/Model/TreeNode.ts
+++ b/backend/src/Model/TreeNode.ts
@@ -83,6 +83,7 @@ export class TreeNode {
     if (node.message) {
       this.setMessage(node.message)
       this.onMessage.dispatch(node.message)
+      this.mqttMessage = node.mqttMessage
     }
 
     this.mergeEdges(node)