Fix process enable queue guard not being reset on failed runs

paul-szczepanek-arm · paul-szczepanek-arm · commit 4fae82898753 · 2021-06-09T18:50:17.000+01:00
diff --git a/connectivity/FEATURE_BLE/source/generic/GapImpl.cpp b/connectivity/FEATURE_BLE/source/generic/GapImpl.cpp
@@ -2461,6 +2461,8 @@ ble_error_t Gap::startAdvertising(
 #if BLE_FEATURE_EXTENDED_ADVERTISING
 void Gap::process_enable_queue()
 {
+    _process_enable_queue_pending = false;
+
     tr_info("Evaluating pending advertising sets to be started");
     if (!_advertising_enable_command_params.number_of_handles) {
         /* no set pending to be enabled */
@@ -2506,7 +2508,6 @@ void Gap::process_enable_queue()
     }
 
     _advertising_enable_command_params.number_of_handles = 0;
-    _process_enable_queue_pending = false;
 }
 #endif //BLE_FEATURE_EXTENDED_ADVERTISING
 

Original file line number	Diff line number	Diff line change
`@@ -2461,6 +2461,8 @@ ble_error_t Gap::startAdvertising(`
`2461`	`2461`	`#if BLE_FEATURE_EXTENDED_ADVERTISING`
`2462`	`2462`	`void Gap::process_enable_queue()`
`2463`	`2463`	`{`
	`2464`	`+ _process_enable_queue_pending = false;`
	`2465`	`+`
`2464`	`2466`	`tr_info("Evaluating pending advertising sets to be started");`
`2465`	`2467`	`if (!_advertising_enable_command_params.number_of_handles) {`
`2466`	`2468`	`/* no set pending to be enabled */`
`@@ -2506,7 +2508,6 @@ void Gap::process_enable_queue()`
`2506`	`2508`	`}`
`2507`	`2509`
`2508`	`2510`	`_advertising_enable_command_params.number_of_handles = 0;`
`2509`		`- _process_enable_queue_pending = false;`
`2510`	`2511`	`}`
`2511`	`2512`	`#endif //BLE_FEATURE_EXTENDED_ADVERTISING`
`2512`	`2513`