From 8568b56ac6cdcc39efdc19b3c0fd6cad27d51ac0 Mon Sep 17 00:00:00 2001 From: Jonathan Bennett Date: Thu, 7 Aug 2025 12:28:01 -0500 Subject: [PATCH 1/2] Fix a crash on Native reboot (#7570) --- src/Power.cpp | 6 ++++-- src/mesh/api/WiFiServerAPI.cpp | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/Power.cpp b/src/Power.cpp index b489bc33c..8a16132f1 100644 --- 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 diff --git a/src/mesh/api/WiFiServerAPI.cpp b/src/mesh/api/WiFiServerAPI.cpp index 5b63bc165..b19194f78 100644 --- 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) From 7b874cf597e1a68dd9adafe903e87ce0c02943fd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 8 Aug 2025 11:31:49 -0500 Subject: [PATCH 2/2] chore(deps): update meshtastic/device-ui digest to d044c01 (#7578) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- platformio.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio.ini b/platformio.ini index 6330f3908..a5a23e56f 100644 --- a/platformio.ini +++ b/platformio.ini @@ -110,7 +110,7 @@ lib_deps = [device-ui_base] lib_deps = # renovate: datasource=git-refs depName=meshtastic/device-ui packageName=https://github.com/meshtastic/device-ui gitBranch=master - https://github.com/meshtastic/device-ui/archive/c75d545bf9e8d1fe20051c319f427f711113ff22.zip + https://github.com/meshtastic/device-ui/archive/d044c01e87583867011991a96f926e4e929d8a93.zip ; Common libs for environmental measurements in telemetry module [environmental_base]