fix in event.rs: safely unwrapping keyboard::Mod

Rust-SDL2 · Jul 8, 2018 · 4bb6b9a · 4bb6b9a
1 parent 97e1f79
commit 4bb6b9a
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/sdl2/event.rs b/src/sdl2/event.rs
@@ -1262,12 +1262,13 @@ impl Event {
 
             EventType::KeyDown => {
                 let event = raw.key;
+
                 Event::KeyDown {
                     timestamp: event.timestamp,
                     window_id: event.windowID,
                     keycode: Keycode::from_i32(event.keysym.sym as i32),
                     scancode: Scancode::from_i32(event.keysym.scancode as i32),
-                    keymod: keyboard::Mod::from_bits(event.keysym.mod_).unwrap(),
+                    keymod: Event::unwrap_keymod(keyboard::Mod::from_bits(event.keysym.mod_)),
                     repeat: event.repeat != 0
                 }
             }
@@ -1607,6 +1608,13 @@ impl Event {
         }}                      // close unsafe & match
     }
 
+    pub fn unwrap_keymod(keymod_option: Option<keyboard::Mod>) -> keyboard::Mod {
+        match keymod_option {
+            None => keyboard::Mod::empty(),
+            Some(x) => x,
+        }
+    }
+
     pub fn is_user_event(&self) -> bool {
         match *self {
             Event::User { .. } => true,