[Controller] Fix really strange merge issue (return statement got lost)

letscontrolit · Oct 2, 2024 · 632e16b · 632e16b
1 parent b590c2f
commit 632e16b
Showing 1 changed file with 3 additions and 2 deletions.
diff --git 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.