Fix windows crash when no bluetooth adapter available

Navideck · Mar 13, 2024 · 2ab3209 · 2ab3209
1 parent 1f7ba28
commit 2ab3209
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/windows/src/universal_ble_plugin.cpp b/windows/src/universal_ble_plugin.cpp
@@ -500,11 +500,19 @@ namespace universal_ble
 
   winrt::fire_and_forget UniversalBlePlugin::InitializeAsync()
   {
-    auto bluetoothAdapter = co_await BluetoothAdapter::GetDefaultAsync();
-    bluetoothRadio = co_await bluetoothAdapter.GetRadioAsync();
-    if (bluetoothRadio)
+    auto radios = co_await Radio::GetRadiosAsync();
+    for (auto &&radio : radios)
     {
-      radioStateChangedRevoker = bluetoothRadio.StateChanged(winrt::auto_revoke, {this, &UniversalBlePlugin::Radio_StateChanged});
+      if (radio.Kind() == RadioKind::Bluetooth)
+      {
+        bluetoothRadio = radio;
+        radioStateChangedRevoker = bluetoothRadio.StateChanged(winrt::auto_revoke, {this, &UniversalBlePlugin::Radio_StateChanged});
+        break;
+      }
+    }
+    if (!bluetoothRadio)
+    {
+      std::cout << "Bluetooth is not available" << std::endl;
     }
   }