From 32b7e4664a26afa03c91c98e9fccf2b1d4e800c8 Mon Sep 17 00:00:00 2001
From: Luc <8822552+luc-github@users.noreply.github.com>
Date: Mon, 18 Jul 2022 10:38:35 +0800
Subject: [PATCH] Add sanity check to avoid error if preferences key does not
 exist (which should never happen if user do a proper reset)

---
 esp3d/src/core/settings_esp3d.cpp | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/esp3d/src/core/settings_esp3d.cpp b/esp3d/src/core/settings_esp3d.cpp
index 59856e5d..90c504f6 100644
--- a/esp3d/src/core/settings_esp3d.cpp
+++ b/esp3d/src/core/settings_esp3d.cpp
@@ -787,7 +787,11 @@ uint8_t Settings_ESP3D::read_byte (int pos, bool * haserror)
         return value;
     }
     String p = "P_" + String(pos);
-    value  = prefs.getChar(p.c_str(), get_default_byte_value(pos));
+    if (prefs.isKey(p.c_str())) {
+        value  = prefs.getChar(p.c_str(), get_default_byte_value(pos));
+    } else {
+        value  = get_default_byte_value(pos);
+    }
     prefs.end();
 #endif //SETTINGS_IN_PREFERENCES
     if(haserror) {
@@ -901,7 +905,11 @@ const char * Settings_ESP3D::read_string (int pos, bool *haserror)
         return "";
     }
     String p = "P_" + String(pos);
-    res = prefs.getString(p.c_str(), get_default_string_value(pos));
+    if (prefs.isKey(p.c_str())) {
+        res = prefs.getString(p.c_str(), get_default_string_value(pos));
+    } else {
+        res = get_default_string_value(pos);
+    }
     prefs.end();
 
     if (res.length() > size_max) {
@@ -996,7 +1004,11 @@ uint32_t Settings_ESP3D::read_uint32(int pos, bool * haserror)
         return res;
     }
     String p = "P_" + String(pos);
-    res = prefs.getUInt(p.c_str(), res);
+    if (prefs.isKey(p.c_str())) {
+        res = prefs.getUInt(p.c_str(), res);
+    } else {
+        res = get_default_int32_value(pos);
+    }
     prefs.end();
 #endif //SETTINGS_IN_PREFERENCES
     if (haserror) {