Fix a crash on Native reboot (#7570)

2025-08-11 16:07:13 +00:00 · 2025-08-07 12:28:01 -05:00 · 2025-08-07 12:28:01 -05:00 · 8568b56ac6
commit 8568b56ac6
parent f2a880f813
2 changed files with 8 additions and 3 deletions
--- a/src/Power.cpp
+++ b/src/Power.cpp
@ -724,10 +724,12 @@ void Power::reboot()
    SPI.end();
    Wire.end();
    Serial1.end();
-    if (screen)
+    if (screen) {
        delete screen;
+        screen = nullptr;
+    }
    LOG_DEBUG("final reboot!");
-    reboot();
+    ::reboot();
 #elif defined(ARCH_STM32WL)
    HAL_NVIC_SystemReset();
 #else
--- a/src/mesh/api/WiFiServerAPI.cpp
+++ b/src/mesh/api/WiFiServerAPI.cpp
@ -17,7 +17,10 @@ void initApiServer(int port)
 }
 void deInitApiServer()
 {
-    delete apiPort;
+    if (apiPort) {
+        delete apiPort;
+        apiPort = nullptr;
+    }
 }

 WiFiServerAPI::WiFiServerAPI(WiFiClient &_client) : ServerAPI(_client)