From ecbe6ac618067f57b9a4b307559a574f027a71fe Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Sat, 9 Mar 2019 14:39:48 +0100
Subject: [PATCH] 6.4.1.21 Fix exception on GUI

6.4.1.21 20190309
 * Fix exception on GUI Configure Logging and Configure Other (#5424)
---
 sonoff/_changelog.ino        | 5 ++++-
 sonoff/sonoff_version.h      | 2 +-
 sonoff/xdrv_01_webserver.ino | 6 +++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/sonoff/_changelog.ino b/sonoff/_changelog.ino
index 0bc5eb73e..7fcc80b8d 100644
--- a/sonoff/_changelog.ino
+++ b/sonoff/_changelog.ino
@@ -1,4 +1,7 @@
-/* 6.4.1.20 20190304
+/* 6.4.1.21 20190309
+ * Fix exception on GUI Configure Logging and Configure Other (#5424)
+ *
+ * 6.4.1.20 20190304
  * Changed webserver content handling from single String to small Chunks increasing RAM
  * Changed logging message handling
  * Fix additional characters in fallbacktopic, hostname and mqttclient on core 2.5.0 (#5359, #5417)
diff --git a/sonoff/sonoff_version.h b/sonoff/sonoff_version.h
index 6dc3c6f38..89c999a90 100644
--- a/sonoff/sonoff_version.h
+++ b/sonoff/sonoff_version.h
@@ -20,7 +20,7 @@
 #ifndef _SONOFF_VERSION_H_
 #define _SONOFF_VERSION_H_
 
-#define VERSION            0x06040114
+#define VERSION            0x06040115
 
 #define D_PROGRAMNAME      "Sonoff-Tasmota"
 #define D_AUTHOR           "Theo Arends"
diff --git a/sonoff/xdrv_01_webserver.ino b/sonoff/xdrv_01_webserver.ino
index cfb563e92..bf1f96f34 100644
--- a/sonoff/xdrv_01_webserver.ino
+++ b/sonoff/xdrv_01_webserver.ino
@@ -1368,7 +1368,7 @@ void HandleLoggingConfiguration(void)
         (i == llevel) ? " selected" : "", i, i,
         GetTextIndexed(stemp1, sizeof(stemp1), i, kLoggingLevels));
     }
-    WSContentSend(PSTR("</select></p>"));
+    WSContentSend(F("</select></p>"));
   }
   WSContentSend_P(HTTP_FORM_LOG2, Settings.syslog_host, Settings.syslog_port, Settings.tele_period);
   WSContentSend(FPSTR(HTTP_FORM_END));
@@ -1436,7 +1436,7 @@ void HandleOtherConfiguration(void)
   }
 
 #ifdef USE_EMULATION
-  WSContentSend(PSTR("<p></p><fieldset><legend><b>&nbsp;" D_EMULATION "&nbsp;</b></legend><p>"));  // Keep close to Friendlynames so do not use <br/>
+  WSContentSend(F("<p></p><fieldset><legend><b>&nbsp;" D_EMULATION "&nbsp;</b></legend><p>"));  // Keep close to Friendlynames so do not use <br/>
   for (uint8_t i = 0; i < EMUL_MAX; i++) {
     WSContentSend_P(PSTR("<input id='r%d' name='b2' type='radio' value='%d'%s><b>%s</b> %s<br/>"),  // Different id only used for labels
       i, i,
@@ -1444,7 +1444,7 @@ void HandleOtherConfiguration(void)
       GetTextIndexed(stemp, sizeof(stemp), i, kEmulationOptions),
       (i == EMUL_NONE) ? "" : (i == EMUL_WEMO) ? D_SINGLE_DEVICE : D_MULTI_DEVICE);
   }
-  WSContentSend(PSTR("</p></fieldset>"));
+  WSContentSend(F("</p></fieldset>"));
 #endif  // USE_EMULATION
 
   WSContentSend(FPSTR(HTTP_FORM_END));