From faadccd6cb952e2afa64c93913ab355fbc204ae2 Mon Sep 17 00:00:00 2001 From: andreas Date: Fri, 11 Mar 2022 15:39:29 +0100 Subject: [PATCH] correct factory reset handling after optimization --- lib/config/GWConfig.cpp | 2 +- lib/config/GwConfigItem.h | 23 +++++++++-------------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/lib/config/GWConfig.cpp b/lib/config/GWConfig.cpp index 9ed1181..f7316df 100644 --- a/lib/config/GWConfig.cpp +++ b/lib/config/GWConfig.cpp @@ -91,7 +91,7 @@ bool GwConfigHandler::updateValue(String name, String value){ bool GwConfigHandler::reset(bool save){ LOG_DEBUG(GwLog::LOG,"reset config"); for (int i=0;iupdateValue(configs[i]->getDefault(),true); + configs[i]->updateValue(configs[i]->getDefault()); } if (!save) return true; return saveConfig(); diff --git a/lib/config/GwConfigItem.h b/lib/config/GwConfigItem.h index 01d5f52..44f8a06 100644 --- a/lib/config/GwConfigItem.h +++ b/lib/config/GwConfigItem.h @@ -12,21 +12,16 @@ class GwConfigInterface{ bool secret=false; String changedValue; bool hasChangedValue=false; - void updateValue(String value,bool cmpDefault=false){ - hasChangedValue=false; - if (cmpDefault){ - if (value != initialValue) { - changedValue=value; - hasChangedValue=true; - } + void updateValue(String value) + { + hasChangedValue = false; + if (value != this->value) + { + changedValue = value; + hasChangedValue = true; } - else{ - if (value != this->value) { - changedValue=value; - hasChangedValue=true; - } - } - } + } + public: GwConfigInterface(const String &name, const char * initialValue, bool secret=false){ this->name=name;