Skip to content

Commit 1435e67

Browse files
committed
fix: fallback to selecting first controller during refresh, if None selected
1 parent 45ced96 commit 1435e67

1 file changed

Lines changed: 9 additions & 0 deletions

File tree

src/app.rs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -611,6 +611,8 @@ impl App {
611611
if let Some(req) = &self.requests.display_passkey {
612612
req.render(frame, popup_area);
613613
}
614+
} else {
615+
frame.render_widget("No Bluetooth adapters found. This will automatically refresh when any adapter is detected!".red().bold(), self.area(frame));
614616
}
615617
}
616618

@@ -689,6 +691,13 @@ impl App {
689691
}
690692
} else {
691693
// Add new detected adapters
694+
695+
// Coming from having NO adapters (e.g. having suspended), no adapter is selected.
696+
// This makes it fallback select the FIRST controller.
697+
// TODO: ideally we would remember what controller was selected before...
698+
if self.controllers.is_empty() && self.controller_state.selected().is_none() {
699+
self.controller_state.select_first();
700+
}
692701
self.controllers.push(refreshed_controller);
693702
}
694703
}

0 commit comments

Comments
 (0)