From 96fe9aeb31855e9322e717c451368722b6c2d80e Mon Sep 17 00:00:00 2001 From: MichaelDvP Date: Wed, 25 Oct 2023 17:44:30 +0200 Subject: [PATCH] dont queue mqtt if not connected, dev.4e --- src/mqtt.cpp | 3 ++- src/version.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/mqtt.cpp b/src/mqtt.cpp index 3248dfb24..ae8f7e05b 100644 --- a/src/mqtt.cpp +++ b/src/mqtt.cpp @@ -472,6 +472,7 @@ void Mqtt::on_disconnect(espMqttClientTypes::DisconnectReason reason) { } else { LOG_WARNING("MQTT disconnected: code %d", reason); } + mqttClient_->clearQueue(true); } // MQTT on_connect - when an MQTT connect is established @@ -589,7 +590,7 @@ bool Mqtt::queue_message(const uint8_t operation, const std::string & topic, con return true; } } - if (!mqtt_enabled_ || topic.empty()) { + if (!mqtt_enabled_ || topic.empty() || !connected()) { return false; // quit, not using MQTT } // check free mem diff --git a/src/version.h b/src/version.h index ca8ecd579..d3e789318 100644 --- a/src/version.h +++ b/src/version.h @@ -1 +1 @@ -#define EMSESP_APP_VERSION "3.6.3-dev.4d" +#define EMSESP_APP_VERSION "3.6.3-dev.4e"