Skip to content

Commit

Permalink
fixed issue #18
Browse files Browse the repository at this point in the history
  • Loading branch information
inyourface34456 committed Nov 3, 2024
1 parent f254082 commit 7ce7ea0
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions plastic_tui/src/ui.rs
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ pub struct Ui {

menu: MenuState<MenuEvent>,
audio_player: Option<AudioPlayer<f32>>,
gilrs: Gilrs,
gilrs: Option<Gilrs>,
active_gamepad: Option<gilrs::GamepadId>,

/// For terminals without support for `Release` key event, we keep the button pressed for some
Expand Down Expand Up @@ -134,7 +134,7 @@ impl Ui {
} else {
None
},
gilrs: Gilrs::new().unwrap(),
gilrs: Gilrs::new().ok(),
keyboard_event_counter: HashMap::new(),
active_gamepad: None,
}
Expand Down Expand Up @@ -451,14 +451,19 @@ impl Ui {

fn handle_gamepad(&mut self) {
// set events in the cache and check if gamepad is still active
while let Some(GilrsEvent { id, event, .. }) = self.gilrs.next_event() {
if self.gilrs.is_none() {
return;
}


while let Some(GilrsEvent { id, event, .. }) = self.gilrs.as_mut().unwrap().next_event() {
self.active_gamepad = Some(id);
if event == EventType::Disconnected {
self.active_gamepad = None;
}
}

if let Some(gamepad) = self.active_gamepad.map(|id| self.gilrs.gamepad(id)) {
if let Some(gamepad) = self.active_gamepad.map(|id| self.gilrs.as_mut().unwrap().gamepad(id)) {
for (controller_button, nes_button) in &[
(Button::South, NESKey::B),
(Button::East, NESKey::A),
Expand Down

0 comments on commit 7ce7ea0

Please sign in to comment.