Skip to content

Commit 9604e85

Browse files
ThinkofnameCobrand
authored andcommitted
Ignore unrecognized keyboard modifiers
Fixes a crash when pressing any key on linux
1 parent 9039782 commit 9604e85

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/sdl2/event.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -797,7 +797,7 @@ impl Event {
797797
window_id,
798798
win_event
799799
} => {
800-
let (win_event_id, data1, data2) = win_event.to_ll();
800+
let (win_event_id, data1, data2) = win_event.to_ll();
801801
let event = ll::SDL_WindowEvent {
802802
type_: ll::SDL_WINDOWEVENT,
803803
timestamp: timestamp,
@@ -1298,7 +1298,7 @@ impl Event {
12981298
window_id: event.windowID,
12991299
keycode: Keycode::from_i32(event.keysym.sym as i32),
13001300
scancode: Scancode::from_i32(event.keysym.scancode as i32),
1301-
keymod: keyboard::Mod::from_bits(event.keysym._mod as SDL_Keymod).unwrap(),
1301+
keymod: keyboard::Mod::from_bits_truncate(event.keysym._mod as SDL_Keymod),
13021302
repeat: event.repeat != 0
13031303
}
13041304
}
@@ -1310,7 +1310,7 @@ impl Event {
13101310
window_id: event.windowID,
13111311
keycode: Keycode::from_i32(event.keysym.sym as i32),
13121312
scancode: Scancode::from_i32(event.keysym.scancode as i32),
1313-
keymod: keyboard::Mod::from_bits(event.keysym._mod as SDL_Keymod).unwrap(),
1313+
keymod: keyboard::Mod::from_bits_truncate(event.keysym._mod as SDL_Keymod),
13141314
repeat: event.repeat != 0
13151315
}
13161316
}

0 commit comments

Comments
 (0)