From 4c28d512a1ce58d6a3d0241b19b95b481b7831a5 Mon Sep 17 00:00:00 2001
From: Gunnar Skjold <gunnar.skjold@gmail.com>
Date: Sun, 24 Dec 2023 06:59:40 +0100
Subject: [PATCH] Changed mqtt disconnect to avoid exception

---
 lib/AmsMqttHandler/include/AmsMqttHandler.h |  1 +
 lib/AmsMqttHandler/src/AmsMqttHandler.cpp   | 38 ++++++++-------------
 2 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/lib/AmsMqttHandler/include/AmsMqttHandler.h b/lib/AmsMqttHandler/include/AmsMqttHandler.h
index 811c15ca..e8516586 100644
--- a/lib/AmsMqttHandler/include/AmsMqttHandler.h
+++ b/lib/AmsMqttHandler/include/AmsMqttHandler.h
@@ -50,6 +50,7 @@ public:
 protected:
     RemoteDebug* debugger;
     MqttConfig mqttConfig;
+    bool mqttConfigChanged = true;
     MQTTClient mqtt = MQTTClient(256);
     unsigned long lastMqttRetry = -10000;
     bool caVerification = true;
diff --git a/lib/AmsMqttHandler/src/AmsMqttHandler.cpp b/lib/AmsMqttHandler/src/AmsMqttHandler.cpp
index 4126fd4f..abfc3560 100644
--- a/lib/AmsMqttHandler/src/AmsMqttHandler.cpp
+++ b/lib/AmsMqttHandler/src/AmsMqttHandler.cpp
@@ -9,6 +9,7 @@ void AmsMqttHandler::setCaVerification(bool caVerification) {
 
 void AmsMqttHandler::setConfig(MqttConfig& mqttConfig) {
 	this->mqttConfig = mqttConfig;
+	this->mqttConfigChanged = true;
 }
 
 bool AmsMqttHandler::connect() {
@@ -19,6 +20,8 @@ bool AmsMqttHandler::connect() {
 	lastMqttRetry = millis();
 
 	time_t epoch = time(nullptr);
+	
+	WiFiClient *actualClient = NULL;
 
 	if(mqttConfig.ssl) {
 		if(epoch < FirmwareVersion::BuildEpoch) {
@@ -33,7 +36,9 @@ bool AmsMqttHandler::connect() {
 				if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf_P(PSTR("ESP8266 firmware does not have enough memory...\n"));
 				return false;
 			#endif
-		
+		}
+
+		if(mqttConfigChanged) {
 			if(caVerification && LittleFS.begin()) {
 				File file;
 
@@ -101,25 +106,21 @@ bool AmsMqttHandler::connect() {
 				mqttClient->stop();
 				delete mqttClient;
 			}
-			mqttClient = mqttSecureClient;
-
-			if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf_P(PSTR("MQTT SSL setup complete (%dkb free heap)\n"), ESP.getFreeHeap());
 		}
-	} else if(mqttSecureClient != NULL) {
-		mqttSecureClient->stop();
-		delete mqttSecureClient;
-		mqttSecureClient = NULL;
-		mqttClient = NULL;
-	}
-	
-	if(mqttClient == NULL) {
+		actualClient = mqttSecureClient;
+
+		if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf_P(PSTR("MQTT SSL setup complete (%dkb free heap)\n"), ESP.getFreeHeap());
+	} else {
 		if(debugger->isActive(RemoteDebug::INFO)) debugger->printf_P(PSTR("No SSL, using client without SSL support\n"));
-		mqttClient = new WiFiClient();
+		if(mqttClient == NULL) {
+			mqttClient = new WiFiClient();
+		}
+		actualClient = mqttClient;
 	}
 
     if(debugger->isActive(RemoteDebug::INFO)) debugger->printf_P(PSTR("Connecting to MQTT %s:%d\n"), mqttConfig.host, mqttConfig.port);
 	
-	mqtt.begin(mqttConfig.host, mqttConfig.port, *mqttClient);
+	mqtt.begin(mqttConfig.host, mqttConfig.port, *actualClient);
 
 	#if defined(ESP8266)
 		if(mqttSecureClient) {
@@ -160,15 +161,6 @@ void AmsMqttHandler::disconnect() {
     mqtt.loop();
     delay(10);
     yield();
-
-	if(mqttClient != NULL) {
-		mqttClient->stop();
-		delete mqttClient;
-		mqttClient = NULL;
-		if(mqttSecureClient != NULL) {
-			mqttSecureClient = NULL;
-		}
-	}
 }
 
 lwmqtt_err_t AmsMqttHandler::lastError() {