check set stopped before taking action

Author: paul-szczepanek-arm

connectivity/FEATURE_BLE/source/generic/GapImpl.cpp

@@ -3479,17 +3479,31 @@ void Gap::on_advertising_set_terminated(
             connection_handle,
             to_string(status),
             number_of_completed_extended_advertising_events);
+    
+    ble_error_t error_code = BLE_ERROR_UNSPECIFIED;
+    bool connected = false;
+
+    if (status == hci_error_code_t::SUCCESS) {
+        /* hci code success means connection terminated it */
+        connected = true;
+        error_code = BLE_ERROR_NONE;
+    } else if (status == hci_error_code_t::OPERATION_CANCELLED_BY_HOST) {
+        /* if we stopped the set ourselves this is not an error */
+        error_code = BLE_ERROR_NONE;
+    }
 
-    _active_sets.clear(advertising_handle);
-    _pending_sets.clear(advertising_handle);
+    if (error_code == BLE_ERROR_NONE) {
+        _active_sets.clear(advertising_handle);
+        _pending_sets.clear(advertising_handle);
 
-    // If this is part of the address refresh start advertising again.
-    if (_address_refresh_sets.get(advertising_handle) && !connection_handle) {
-        _address_refresh_sets.clear(advertising_handle);
-        tr_info("Part of the address refresh, restarting advertising");
-        startAdvertising(advertising_handle);
-        _adv_started_from_refresh.set(advertising_handle);
-        return;
+        // If this is part of the address refresh start advertising again.
+        if (_address_refresh_sets.get(advertising_handle) && !connection_handle) {
+            _address_refresh_sets.clear(advertising_handle);
+            tr_info("Part of the address refresh, restarting advertising");
+            startAdvertising(advertising_handle);
+            _adv_started_from_refresh.set(advertising_handle);
+            return;
+        }
     }
 
     /* postpone as other events may still be pending */
@@ -3503,18 +3517,6 @@ void Gap::on_advertising_set_terminated(
         return;
     }
 
-    ble_error_t error_code = BLE_ERROR_UNSPECIFIED;
-    bool connected = false;
-
-    if (status == hci_error_code_t::SUCCESS) {
-        /* hci code success means connection terminated it */
-        connected = true;
-        error_code = BLE_ERROR_NONE;
-    } else if (status == hci_error_code_t::OPERATION_CANCELLED_BY_HOST) {
-        /* if we stopped the set ourselves this is not an error */
-        error_code = BLE_ERROR_NONE;
-    }
-
     _event_handler->onAdvertisingEnd(
         AdvertisingEndEvent(
             advertising_handle,