don't destroy set before it stops

Author: paul-szczepanek-arm

BLE_GAP/source/main.cpp

@@ -333,6 +333,15 @@ class GapDemo : private mbed::NonCopyable<GapDemo>, public ble::Gap::EventHandle
         if (event.isConnected()) {
             printf("Stopped advertising early due to connection\r\n");
         }
+
+#if BLE_FEATURE_EXTENDED_ADVERTISING
+        ble_error_t error = _gap.destroyAdvertisingSet(_extended_adv_handle);
+        if (error) {
+            print_error(error, "Error caused by Gap::destroyAdvertisingSet");
+        }
+
+        _extended_adv_handle = ble::INVALID_ADVERTISING_HANDLE;
+#endif //BLE_FEATURE_EXTENDED_ADVERTISING
     }
 
     void onAdvertisingStart(const ble::AdvertisingStartEvent &event) override
@@ -499,19 +508,12 @@ class GapDemo : private mbed::NonCopyable<GapDemo>, public ble::Gap::EventHandle
                     print_error(error, "Error caused by Gap::stopAdvertising");
                 }
             }
-
-            ble_error_t error = _gap.destroyAdvertisingSet(_extended_adv_handle);
-            if (error) {
-                print_error(error, "Error caused by Gap::destroyAdvertisingSet");
-            }
-
-            _extended_adv_handle = ble::INVALID_ADVERTISING_HANDLE;
         }
-#endif // BLE_FEATURE_EXTENDED_ADVERTISING
-
+#else
         _is_in_scanning_phase = true;
 
         _event_queue.call_in(delay, [this]{ scan(); });
+#endif // BLE_FEATURE_EXTENDED_ADVERTISING
     }
 
     /** print some information about our radio activity */