From 6ba59385d4ca8d770f9ecf21ef1d761782032112 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Thu, 16 May 2024 14:43:30 +0200
Subject: [PATCH] Fix Domoticz re-subscribe on MQTT reconnect. Regression from
 v13.4.0.3 (#21281)

---
 CHANGELOG.md                                     | 3 ++-
 RELEASENOTES.md                                  | 3 ++-
 tasmota/tasmota_xdrv_driver/xdrv_07_domoticz.ino | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 74c89fca9..1b7c68ff0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,9 +13,10 @@ All notable changes to this project will be documented in this file.
 - ESP32 compiler option from `target-align` to `no-target-align` (#21407)
 
 ### Fixed
+- Domoticz re-subscribe on MQTT reconnect. Regression from v13.4.0.3 (#21281)
 
 ### Removed
-- Support of old insecure fingerprint algorithm - deprecated since v8.4.0 (#21417)
+- Support of old insecure fingerprint algorithm. Deprecated since v8.4.0 (#21417)
 
 ## [Released]
 
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index ced7b1372..cdc46fa50 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -128,6 +128,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm
 - ESP32 compiler option from `target-align` to `no-target-align` [#21407](https://github.com/arendst/Tasmota/issues/21407)
 
 ### Fixed
+- Domoticz re-subscribe on MQTT reconnect. Regression from v13.4.0.3 [#21281](https://github.com/arendst/Tasmota/issues/21281)
 
 ### Removed
-- Support of old insecure fingerprint algorithm - deprecated since v8.4.0 [#21417](https://github.com/arendst/Tasmota/issues/21417)
+- Support of old insecure fingerprint algorithm. Deprecated since v8.4.0 [#21417](https://github.com/arendst/Tasmota/issues/21417)
diff --git a/tasmota/tasmota_xdrv_driver/xdrv_07_domoticz.ino b/tasmota/tasmota_xdrv_driver/xdrv_07_domoticz.ino
index 869742ad4..adfdec32c 100644
--- a/tasmota/tasmota_xdrv_driver/xdrv_07_domoticz.ino
+++ b/tasmota/tasmota_xdrv_driver/xdrv_07_domoticz.ino
@@ -232,7 +232,8 @@ void DomoticzMqttSubscribe(void) {
     Domoticz->subscribe = false;
     MqttUnsubscribe(stopic);
   }
-  if (!Domoticz->subscribe && any_relay) {
+//  if (!Domoticz->subscribe && any_relay) {  // Fails on MQTT server reconnect
+  if (any_relay) {
     Domoticz->subscribe = true;
     MqttSubscribe(stopic);
   }