From db8f8db8e87f253ef2d8d7fc2d65d37879a94a6d Mon Sep 17 00:00:00 2001
From: GUVWAF <78759985+GUVWAF@users.noreply.github.com>
Date: Thu, 21 Dec 2023 21:59:45 +0100
Subject: [PATCH] Don't disconnect WiFi when we're actively reconnecting
 (#3026)

WiFiEvents may happen asynchronously
---
 src/mesh/wifi/WiFiAPClient.cpp | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/mesh/wifi/WiFiAPClient.cpp b/src/mesh/wifi/WiFiAPClient.cpp
index 1e521e0331..b0b033ba0b 100644
--- a/src/mesh/wifi/WiFiAPClient.cpp
+++ b/src/mesh/wifi/WiFiAPClient.cpp
@@ -38,7 +38,8 @@ bool APStartupComplete = 0;
 
 unsigned long lastrun_ntp = 0;
 
-bool needReconnect = true; // If we create our reconnector, run it once at the beginning
+bool needReconnect = true;   // If we create our reconnector, run it once at the beginning
+bool isReconnecting = false; // If we are currently reconnecting
 
 WiFiUDP syslogClient;
 Syslog syslog(syslogClient);
@@ -115,6 +116,7 @@ static int32_t reconnectWiFi()
             wifiPsw = NULL;
 
         needReconnect = false;
+        isReconnecting = true;
 
         // Make sure we clear old connection credentials
 #ifdef ARCH_ESP32
@@ -129,6 +131,7 @@ static int32_t reconnectWiFi()
         if (!WiFi.isConnected()) {
             WiFi.begin(wifiName, wifiPsw);
         }
+        isReconnecting = false;
     }
 
 #ifndef DISABLE_NTP
@@ -277,10 +280,12 @@ static void WiFiEvent(WiFiEvent_t event)
         break;
     case ARDUINO_EVENT_WIFI_STA_DISCONNECTED:
         LOG_INFO("Disconnected from WiFi access point\n");
-        WiFi.disconnect(false, true);
-        syslog.disable();
-        needReconnect = true;
-        wifiReconnect->setIntervalFromNow(1000);
+        if (!isReconnecting) {
+            WiFi.disconnect(false, true);
+            syslog.disable();
+            needReconnect = true;
+            wifiReconnect->setIntervalFromNow(1000);
+        }
         break;
     case ARDUINO_EVENT_WIFI_STA_AUTHMODE_CHANGE:
         LOG_INFO("Authentication mode of access point has changed\n");
@@ -294,10 +299,12 @@ static void WiFiEvent(WiFiEvent_t event)
         break;
     case ARDUINO_EVENT_WIFI_STA_LOST_IP:
         LOG_INFO("Lost IP address and IP address is reset to 0\n");
-        WiFi.disconnect(false, true);
-        syslog.disable();
-        needReconnect = true;
-        wifiReconnect->setIntervalFromNow(1000);
+        if (!isReconnecting) {
+            WiFi.disconnect(false, true);
+            syslog.disable();
+            needReconnect = true;
+            wifiReconnect->setIntervalFromNow(1000);
+        }
         break;
     case ARDUINO_EVENT_WPS_ER_SUCCESS:
         LOG_INFO("WiFi Protected Setup (WPS): succeeded in enrollee mode\n");
@@ -398,4 +405,4 @@ static void WiFiEvent(WiFiEvent_t event)
 uint8_t getWifiDisconnectReason()
 {
     return wifiDisconnectReason;
-}
+}
\ No newline at end of file