Fix race condition, connect->disconnect->discovery

evergreen22 · evergreen22 · commit d69a8e84fa19 · 2021-09-01T22:48:01.000-05:00
diff --git a/src/components/ble/NimbleController.cpp b/src/components/ble/NimbleController.cpp
@@ -250,7 +250,9 @@ int NimbleController::OnGAPEvent(ble_gap_event* event) {
 }
 
 void NimbleController::StartDiscovery() {
-  serviceDiscovery.StartDiscovery(connectionHandle);
+  if (connectionHandle != BLE_HS_CONN_HANDLE_NONE) {
+    serviceDiscovery.StartDiscovery(connectionHandle);
+  }
 }
 
 uint16_t NimbleController::connHandle() {

Original file line number	Diff line number	Diff line change
`@@ -250,7 +250,9 @@ int NimbleController::OnGAPEvent(ble_gap_event* event) {`
`250`	`250`	`}`
`251`	`251`
`252`	`252`	`void NimbleController::StartDiscovery() {`
`253`		`- serviceDiscovery.StartDiscovery(connectionHandle);`
	`253`	`+ if (connectionHandle != BLE_HS_CONN_HANDLE_NONE) {`
	`254`	`+ serviceDiscovery.StartDiscovery(connectionHandle);`
	`255`	`+ }`
`254`	`256`	`}`
`255`	`257`
`256`	`258`	`uint16_t NimbleController::connHandle() {`