From 632e16b2477474aa81e80e0d16fd050b80fed71b Mon Sep 17 00:00:00 2001
From: TD-er <gijs.noorlander@gmail.com>
Date: Wed, 2 Oct 2024 21:05:02 +0200
Subject: [PATCH] [Controller] Fix really strange merge issue (return statement
 got lost)

---
 src/src/ESPEasyCore/Controller.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/src/ESPEasyCore/Controller.cpp b/src/src/ESPEasyCore/Controller.cpp
index 9b19c827d0..6d2c085779 100644
--- a/src/src/ESPEasyCore/Controller.cpp
+++ b/src/src/ESPEasyCore/Controller.cpp
@@ -759,7 +759,7 @@ void SendStatus(struct EventStruct *event, const __FlashStringHelper *status)
 
 void SendStatus(struct EventStruct *event, const String& status)
 {
-  if (status.isEmpty()) {}
+  if (status.isEmpty()) { return; }
 
   switch (event->Source)
   {
@@ -870,6 +870,7 @@ void MQTTStatus(struct EventStruct *event, const String& status)
 
     if (DomoticzMQTT_controllerIndex == enabledMqttController) {
       // Do not send MQTT status updates to Domoticz
+      return;
     }
     String pubname;
     bool   mqtt_retainFlag;
@@ -971,7 +972,7 @@ void SensorSendTask(struct EventStruct *event, unsigned long timestampUnixTime)
 
 void SensorSendTask(struct EventStruct *event, unsigned long timestampUnixTime, unsigned long lasttimer)
 {
-  if (!validTaskIndex(event->TaskIndex)) {}
+  if (!validTaskIndex(event->TaskIndex)) { return; }
 
   // FIXME TD-er: Should a 'disabled' task be rescheduled?
   // If not, then it should be rescheduled after the check to see if it is enabled.