fix for #740 confusion

This commit is contained in:
tablatronix
2019-11-29 19:29:56 -06:00
parent 72bcbd8a80
commit 9d6ce13b92
2 changed files with 11 additions and 3 deletions
+9 -3
View File
@@ -624,7 +624,7 @@ uint8_t WiFiManager::processConfigPortal(){
// skip wifi if no ssid
if(_ssid == ""){
DEBUG_WM(DEBUG_VERBOSE,F("No ssid, skipping wifi"));
DEBUG_WM(DEBUG_VERBOSE,F("No ssid, skipping wifi save"));
}
else{
// attempt sta connection to submitted _ssid, _pass
@@ -1335,8 +1335,6 @@ void WiFiManager::handleWifiSave() {
_ssid = server->arg(F("s")).c_str();
_pass = server->arg(F("p")).c_str();
if(_paramsInWifi) doParamSave();
if (server->arg(FPSTR(S_ip)) != "") {
//_sta_static_ip.fromString(server->arg(FPSTR(S_ip));
String ip = server->arg(FPSTR(S_ip));
@@ -1359,6 +1357,14 @@ void WiFiManager::handleWifiSave() {
DEBUG_WM(DEBUG_DEV,F("static DNS:"),dns);
}
if(_paramsInWifi){
if(_ssid == ""){
handleParamSave(); // send param save result and not wifi connect if no wifi creds
return;
}
else doParamSave();
}
String page = getHTTPHead(FPSTR(S_titlewifisaved)); // @token titlewifisaved
page += FPSTR(HTTP_SAVED);
page += FPSTR(HTTP_END);