From 4a4d664d7df3858b5284e96adada69d969a24411 Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Sat, 14 Nov 2020 12:49:49 +0100
Subject: [PATCH] don't setup mqtt if it's disabled

---
 src/mqtt.cpp | 25 +++++--------------------
 1 file changed, 5 insertions(+), 20 deletions(-)

diff --git a/src/mqtt.cpp b/src/mqtt.cpp
index 7dc881187..3ab2ae3c3 100644
--- a/src/mqtt.cpp
+++ b/src/mqtt.cpp
@@ -356,6 +356,11 @@ void Mqtt::start() {
         mqtt_enabled_            = mqttSettings.enabled;
     });
 
+    // if MQTT disabled, quit
+    if (!mqtt_enabled_) {
+        return;
+    }
+
     mqttClient_->onConnect([this](bool sessionPresent) { on_connect(); });
 
     mqttClient_->onDisconnect([this](AsyncMqttClientDisconnectReason reason) {
@@ -609,26 +614,6 @@ void Mqtt::process_queue() {
         return;
     }
 
-    // show queue - Debug only
-    /*
-    Serial.printf("MQTT queue:\n\r");
-    for (const auto & message : mqtt_messages_) {
-        auto content = message.content_;
-        if (content->operation == Operation::PUBLISH) {
-            // Publish messages
-            Serial.printf(" [%02d] (Pub) topic=%s payload=%s (pid %d, retry #%d)\n\r",
-                          message.id_,
-                          content->topic.c_str(),
-                          content->payload.c_str(),
-                          message.packet_id_,
-                          message.retry_count_);
-        } else {
-            // Subscribe messages
-            Serial.printf(" [%02d] (Sub) topic=%s\n\r", message.id_, content->topic.c_str());
-        }
-    }
-    */
-
     // fetch first from queue and create the full topic name
     auto mqtt_message = mqtt_messages_.front();
     auto message      = mqtt_message.content_;