Merge branch 'development03' into feature/espMqttClient

2 years ago · 65c34f26e0
2 changed files with 5 additions and 3 deletions
--- a/src/config/config.h
+++ b/src/config/config.h
@ -26,7 +26,7 @@
 //#define AP_ONLY

 // timeout for automatic logoff (20 minutes)
-#define LOGOUT_TIMEOUT      (20 * 60 * 60)
+#define LOGOUT_TIMEOUT      (20 * 60)

 //-------------------------------------
 // CONFIGURATION - COMPILE TIME
--- a/src/web/web.cpp
+++ b/src/web/web.cpp
@ -107,8 +107,10 @@ void web::loop(void) {
 void web::tickSecond() {
    if(0 != mLogoutTimeout) {
        mLogoutTimeout -= 1;
-        if(0 == mLogoutTimeout)
-            mProtected = true;
+        if(0 == mLogoutTimeout) {
+            if(strlen(mConfig->sys.adminPwd) > 0)
+                mProtected = true;
+        }

        DPRINTLN(DBG_DEBUG, "auto logout in " + String(mLogoutTimeout));
    }