From edd034ef6833114dcaec24d8ca330cf2e36f8afd Mon Sep 17 00:00:00 2001
From: Alfredo <46104032+rdrgzlng@users.noreply.github.com>
Date: Sat, 5 Jan 2019 20:38:55 +0100
Subject: [PATCH] MQTT GW: Subscribe topic concatenation refactored (#1240)

* Added .DS_Store filter

* MY_MQTT_SUBSCRIBE_TOPIC_PREFIX concatenation refactored
---
 .gitignore                            | 3 ++-
 core/MyGatewayTransportMQTTClient.cpp | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0af2be61..bec8ade2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,4 +11,5 @@ bin
 .idea
 doxygen.log
 TAGS
-tags
\ No newline at end of file
+tags
+.DS_Store
diff --git a/core/MyGatewayTransportMQTTClient.cpp b/core/MyGatewayTransportMQTTClient.cpp
index d3b24679..b8f8c5d8 100644
--- a/core/MyGatewayTransportMQTTClient.cpp
+++ b/core/MyGatewayTransportMQTTClient.cpp
@@ -143,7 +143,10 @@ bool reconnectMQTT(void)
 		// Once connected, publish an announcement...
 		//_MQTT_client.publish("outTopic","hello world");
 		// ... and resubscribe
-		_MQTT_client.subscribe(MY_MQTT_SUBSCRIBE_TOPIC_PREFIX "/+/+/+/+/+");
+		char inTopic[strlen(MY_MQTT_SUBSCRIBE_TOPIC_PREFIX) + strlen("/+/+/+/+/+")];
+		strncpy( inTopic, MY_MQTT_SUBSCRIBE_TOPIC_PREFIX, strlen(MY_MQTT_SUBSCRIBE_TOPIC_PREFIX) + 1 );
+		strcat( inTopic, "/+/+/+/+/+" );
+		_MQTT_client.subscribe( inTopic );
 		return true;
 	}
 	delay(500);