From 8cccca1724879c59d866e8c5c4e5b79f16492c4c Mon Sep 17 00:00:00 2001
From: geronet1 <geronet.bachmaier@gmail.com>
Date: Tue, 28 Nov 2023 17:55:17 +0100
Subject: [PATCH] W5500 config bugfix

---
 src/app.cpp           | 11 ++++-------
 src/app.h             |  4 +---
 src/config/settings.h |  4 +---
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/app.cpp b/src/app.cpp
index 179e3ba3..9dca3773 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -59,7 +59,7 @@ void app::setup() {
         #if defined(AP_ONLY)
             mInnerLoopCb = std::bind(&app::loopStandard, this);
         #else
-            mInnerLoopCb = std::bind(&app::loopWifi, this);
+            mInnerLoopCb = std::bind(&app::loopNetwork, this);
         #endif
     #endif /* !defined(ETHERNET) */
 
@@ -200,13 +200,10 @@ void app::loopStandard(void) {
         mMqtt.loop();
 }
 
-#if !defined(ETHERNET)
-//-----------------------------------------------------------------------------
-void app::loopWifi(void) {
+void app::loopNetwork(void) {
     ah::Scheduler::loop();
     yield();
 }
-#endif /* !defined(ETHERNET) */
 
 //-----------------------------------------------------------------------------
 void app::onNetwork(bool gotIp) {
@@ -231,9 +228,9 @@ void app::onNetwork(bool gotIp) {
         mInnerLoopCb = [this]() { this->loopStandard(); };
     } else {
         #if defined(ETHERNET)
-                mInnerLoopCb = nullptr;
+                mInnerLoopCb = [this]() { this->loopNetwork(); };
         #else /* defined(ETHERNET) */
-                mInnerLoopCb = [this]() { this->loopWifi(); };
+                mInnerLoopCb = [this]() { this->loopNetwork(); };
                 everySec(std::bind(&ahoywifi::tickWifiLoop, &mWifi), "wifiL");
         #endif /* defined(ETHERNET) */
     }
diff --git a/src/app.h b/src/app.h
index 78a5a9df..c2bdf2aa 100644
--- a/src/app.h
+++ b/src/app.h
@@ -65,9 +65,7 @@ class app : public IApp, public ah::Scheduler {
         void setup(void);
         void loop(void);
         void loopStandard(void);
-#if !defined(ETHERNET)
-        void loopWifi(void);
-#endif /* !defined(ETHERNET) */
+        void loopNetwork(void);
         void onNetwork(bool gotIp);
         void regularTickers(void);
 
diff --git a/src/config/settings.h b/src/config/settings.h
index a7cb6a4c..16230d1a 100644
--- a/src/config/settings.h
+++ b/src/config/settings.h
@@ -367,9 +367,7 @@ class settings {
             mCfg.sys.darkMode = false;
             mCfg.sys.schedReboot = false;
             // restore temp settings
-            #if defined(ETHERNET)
-            memcpy(&mCfg.sys, &tmp, sizeof(cfgSys_t));
-            #else /* defined(ETHERNET) */
+            #if !defined(ETHERNET)
             if(keepWifi)
                 memcpy(&mCfg.sys, &tmp, sizeof(cfgSys_t));
             else {