Browse Source

fix: select-bluetooth-device on Windows (#29591)

John Kleinschmidt 3 years ago
parent
commit
396ea4b29c
2 changed files with 3 additions and 1 deletions
  1. 2 1
      shell/browser/lib/bluetooth_chooser.cc
  2. 1 0
      shell/browser/lib/bluetooth_chooser.h

+ 2 - 1
shell/browser/lib/bluetooth_chooser.cc

@@ -60,6 +60,7 @@ void BluetoothChooser::SetAdapterPresence(AdapterPresence presence) {
       event_handler_.Run(content::BluetoothChooserEvent::CANCELLED, "");
       break;
     case AdapterPresence::POWERED_ON:
+      rescan_ = true;
       break;
   }
 }
@@ -92,7 +93,7 @@ void BluetoothChooser::ShowDiscoveryState(DiscoveryState state) {
     case DiscoveryState::DISCOVERING:
       // The first time this state fires is due to a rescan triggering so set a
       // flag to ignore devices
-      if (!refreshing_) {
+      if (rescan_ && !refreshing_) {
         refreshing_ = true;
       } else {
         // The second time this state fires we are now safe to pick a device

+ 1 - 0
shell/browser/lib/bluetooth_chooser.h

@@ -42,6 +42,7 @@ class BluetoothChooser : public content::BluetoothChooser {
   EventHandler event_handler_;
   int num_retries_ = 0;
   bool refreshing_ = false;
+  bool rescan_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(BluetoothChooser);
 };