Optimize disconnect method in WiFiSTA class (#8760)

esp8266 · Dec 16, 2022 · b565b86 · b565b86
1 parent eda64f6
commit b565b86
Showing 1 changed file with 14 additions and 13 deletions.
diff --git a/libraries/ESP8266WiFi/src/ESP8266WiFiSTA.cpp b/libraries/ESP8266WiFi/src/ESP8266WiFiSTA.cpp
@@ -371,13 +371,23 @@ bool ESP8266WiFiSTAClass::disconnect(bool wifioff) {
 bool ESP8266WiFiSTAClass::disconnect(bool wifioff, bool eraseCredentials) {
     bool ret = false;
 
-    // Read current config.
-    struct station_config conf;
-    wifi_station_get_config(&conf);
-
     if (eraseCredentials) {
+        // Read current config.
+        struct station_config conf;
+        wifi_station_get_config(&conf);
+
+        // Erase credentials.
         memset(&conf.ssid, 0, sizeof(conf.ssid));
         memset(&conf.password, 0, sizeof(conf.password));
+
+        // Store modiffied config.
+        ETS_UART_INTR_DISABLE();
+        if(WiFi._persistent) {
+            wifi_station_set_config(&conf);
+        } else {
+            wifi_station_set_config_current(&conf);
+        }
+        ETS_UART_INTR_ENABLE();
     }
 
     // API Reference: wifi_station_disconnect() need to be called after system initializes and the ESP8266 Station mode is enabled.
@@ -386,15 +396,6 @@ bool ESP8266WiFiSTAClass::disconnect(bool wifioff, bool eraseCredentials) {
     else
         ret = true;
 
-    ETS_UART_INTR_DISABLE();
-    if(WiFi._persistent) {
-        wifi_station_set_config(&conf);
-    } else {
-        wifi_station_set_config_current(&conf);
-    }
-
-    ETS_UART_INTR_ENABLE();
-
     if(wifioff) {
         WiFi.enableSTA(false);
     }