Merge pull request #3284 from dhalbert/fix-3171-evt-handler

tannewt · web-flow · commit 377503e61c4a · 2020-08-17T15:02:29.000-07:00
Remove event handler before setting it to NULL
diff --git a/ports/nrf/common-hal/_bleio/Adapter.c b/ports/nrf/common-hal/_bleio/Adapter.c
@@ -483,8 +483,8 @@ mp_obj_t common_hal_bleio_adapter_start_scan(bleio_adapter_obj_t *self, uint8_t*
     err_code = sd_ble_gap_scan_start(&scan_params, sd_data);
 
     if (err_code != NRF_SUCCESS) {
-        self->scan_results = NULL;
         ble_drv_remove_event_handler(scan_on_ble_evt, self->scan_results);
+        self->scan_results = NULL;
         check_nrf_error(err_code);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -483,8 +483,8 @@ mp_obj_t common_hal_bleio_adapter_start_scan(bleio_adapter_obj_t self, uint8_t`
`483`	`483`	`err_code = sd_ble_gap_scan_start(&scan_params, sd_data);`
`484`	`484`
`485`	`485`	`if (err_code != NRF_SUCCESS) {`
`486`		`- self->scan_results = NULL;`
`487`	`486`	`ble_drv_remove_event_handler(scan_on_ble_evt, self->scan_results);`
	`487`	`+ self->scan_results = NULL;`
`488`	`488`	`check_nrf_error(err_code);`
`489`	`489`	`}`
`490`	`490`