Moved webserverPassword into newSettings

2021-12-29 06:19:09 +01:00
parent b013bbd693
commit 4e1943dbc8
6 changed files with 16 additions and 23 deletions
--- a/main/webserver.cpp
+++ b/main/webserver.cpp
@@ -30,6 +30,7 @@
 #include "webserver_dumpnvs.h"
 #endif
 #include "globals.h"
+#include "newsettings.h"

 using namespace std::chrono_literals;

@@ -188,7 +189,7 @@ esp_err_t webserver_status_handler(httpd_req_t *req)

    char tmpBuf[256];
    const auto key_result = httpd_query_key_value(wants_json_query.data(), "json", tmpBuf, 256);
-    if (key_result == ESP_OK && (tmpBuf == stringSettings.webserver_password || stringSettings.webserver_password.empty()))
+    if (key_result == ESP_OK && (configs.webserverPassword.value.empty() || configs.webserverPassword.value == tmpBuf))
    {
        if (!menuDisplayChanged())
        {