From 6c39154e9012cd8aa1a90aa6135d96f955c7ef90 Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Sat, 22 Feb 2020 11:48:13 +0100
Subject: [PATCH] minor fix for default mqtt_nestedjson cmd

---
 src/MyESP.cpp   | 2 +-
 src/ems-esp.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/MyESP.cpp b/src/MyESP.cpp
index 8712ade7f..194645247 100644
--- a/src/MyESP.cpp
+++ b/src/MyESP.cpp
@@ -1880,7 +1880,7 @@ bool MyESP::_fs_loadConfig() {
     _mqtt_keepalive  = mqtt["keepalive"] | MQTT_KEEPALIVE;
     _mqtt_retain     = mqtt["retain"];
     _mqtt_qos        = mqtt["qos"] | MQTT_QOS;
-    _mqtt_nestedjson = mqtt["nestedjson"] | true; // default to on
+    _mqtt_nestedjson = mqtt["nestedjson"]; // default to on
     _mqtt_password   = strdup(mqtt["password"] | "");
     _mqtt_base       = strdup(mqtt["base"] | MQTT_BASE_DEFAULT);
 
diff --git a/src/ems-esp.cpp b/src/ems-esp.cpp
index 347e71677..03442ca17 100644
--- a/src/ems-esp.cpp
+++ b/src/ems-esp.cpp
@@ -867,7 +867,6 @@ void publishEMSValues_mixing() {
 
 // For SM10 and SM100/SM200 Solar Modules
 void publishEMSValues_solar() {
-    char                                      s[20] = {0}; // for formatting strings
     StaticJsonDocument<MQTT_MAX_PAYLOAD_SIZE> doc;
     char                                      data[MQTT_MAX_PAYLOAD_SIZE] = {0};
     JsonObject                                rootSM                      = doc.to<JsonObject>();
@@ -882,6 +881,7 @@ void publishEMSValues_solar() {
         rootSM[SM_PUMPMODULATION] = EMS_SolarModule.pumpModulation;
 
     if (EMS_SolarModule.pump != EMS_VALUE_BOOL_NOTSET) {
+        char s[20] = {0}; // for formatting strings
         rootSM[SM_PUMP] = _bool_to_char(s, EMS_SolarModule.pump);
     }