deal with un-initialized values

helgeerbe · Mar 29, 2023 · a091e80 · a091e80
1 parent a968f09
commit a091e80
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/PowerMeter.cpp b/src/PowerMeter.cpp
@@ -27,9 +27,14 @@ void PowerMeterClass::init()
 
     CONFIG_T& config = Configuration.get();
 
-    MqttSettings.subscribe(config.PowerMeter_MqttTopicPowerMeter1, 0, std::bind(&PowerMeterClass::onMqttMessage, this, _1, _2, _3, _4, _5, _6));
-    MqttSettings.subscribe(config.PowerMeter_MqttTopicPowerMeter2, 0, std::bind(&PowerMeterClass::onMqttMessage, this, _1, _2, _3, _4, _5, _6));
-    MqttSettings.subscribe(config.PowerMeter_MqttTopicPowerMeter3, 0, std::bind(&PowerMeterClass::onMqttMessage, this, _1, _2, _3, _4, _5, _6));
+    if (config.PowerMeter_Enabled && 
+        (strlen(config.PowerMeter_MqttTopicPowerMeter1) > 0) &&
+        (strlen(config.PowerMeter_MqttTopicPowerMeter2) > 0) &&
+        (strlen(config.PowerMeter_MqttTopicPowerMeter3) > 0) ) {
+      MqttSettings.subscribe(config.PowerMeter_MqttTopicPowerMeter1, 0, std::bind(&PowerMeterClass::onMqttMessage, this, _1, _2, _3, _4, _5, _6));
+      MqttSettings.subscribe(config.PowerMeter_MqttTopicPowerMeter2, 0, std::bind(&PowerMeterClass::onMqttMessage, this, _1, _2, _3, _4, _5, _6));
+      MqttSettings.subscribe(config.PowerMeter_MqttTopicPowerMeter3, 0, std::bind(&PowerMeterClass::onMqttMessage, this, _1, _2, _3, _4, _5, _6));
+    }
 
     mqttInitDone = true;