rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-12-21 18:22:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a crash on Native reboot (#7570)

Browse Source
This commit is contained in:
Jonathan Bennett
2025-08-07 12:28:01 -05:00
committed by GitHub
parent f2a880f813
commit 8568b56ac6
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Power.cpp
View File

@@ -724,10 +724,12 @@ void Power::reboot()
SPI.end(); SPI.end();
Wire.end(); Wire.end();
Serial1.end(); Serial1.end();
if (screen) if (screen) {
delete screen; delete screen;
screen = nullptr;
}
LOG_DEBUG("final reboot!"); LOG_DEBUG("final reboot!");
reboot(); ::reboot();
#elif defined(ARCH_STM32WL) #elif defined(ARCH_STM32WL)
HAL_NVIC_SystemReset(); HAL_NVIC_SystemReset();
#else #else

5
src/mesh/api/WiFiServerAPI.cpp
View File

@@ -17,7 +17,10 @@ void initApiServer(int port)
} }
void deInitApiServer() void deInitApiServer()
{ {
delete apiPort; if (apiPort) {
delete apiPort;
apiPort = nullptr;
}
} }
WiFiServerAPI::WiFiServerAPI(WiFiClient &_client) : ServerAPI(_client) WiFiServerAPI::WiFiServerAPI(WiFiClient &_client) : ServerAPI(_client)