Merge pull request #9453 from dhalbert/9.1.x-fix-nordic-restart-crash

bleio_user_reset(): check if BLE running before doing any BLE ops
adafruit · Jul 24, 2024 · 004b677 · 004b677
2 parents 41a85fd + 98610f9
commit 004b677
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/ports/nordic/common-hal/_bleio/__init__.c b/ports/nordic/common-hal/_bleio/__init__.c
@@ -78,9 +78,11 @@ void common_hal_bleio_init(void) {
 }
 
 void bleio_user_reset() {
-    // Stop any user scanning or advertising.
-    common_hal_bleio_adapter_stop_scan(&common_hal_bleio_adapter_obj);
-    common_hal_bleio_adapter_stop_advertising(&common_hal_bleio_adapter_obj);
+    if (common_hal_bleio_adapter_get_enabled(&common_hal_bleio_adapter_obj)) {
+        // Stop any user scanning or advertising.
+        common_hal_bleio_adapter_stop_scan(&common_hal_bleio_adapter_obj);
+        common_hal_bleio_adapter_stop_advertising(&common_hal_bleio_adapter_obj);
+    }
 
     ble_drv_remove_heap_handlers();