#1976 fix: panic in Rust system bridge code when unwrapping /dev/input path for uinput device

Author: sds100

CHANGELOG.md

@@ -10,8 +10,9 @@
 
 ## Fixed
 
-- #1986 trigger screen is usable on slightly rectangular screens with a low DPI
-- #1972 Expert Mode works on Android 10
+- #1986 trigger screen is usable on slightly rectangular screens with a low DPI.
+- #1972 Expert Mode works on Android 10.
+- #1976 Panic in Rust system bridge code on some devices.
 - Bugs with expert mode auto starting time.
 
 ## [4.0.0 Beta 6](https://github.com/sds100/KeyMapper/releases/tag/v4.0.0-beta.06)

evdev/src/main/rust/evdev_manager/core/src/evdev_grab_controller.rs

@@ -274,7 +274,7 @@ impl EvdevGrabController {
     ) -> Result<Vec<PathBuf>, EvdevError> {
         let uinput_paths: Vec<PathBuf> = grabbed_devices
             .iter()
-            .map(|(_, device)| device.uinput.devnode().unwrap().into())
+            .filter_map(|(_, device)| device.uinput.devnode().map(|node| PathBuf::from(node)))
             .collect();
 
         let mut paths: Vec<PathBuf> = Vec::new();
@@ -340,9 +340,13 @@ impl EvdevGrabController {
 impl InotifyCallback for EvdevGrabController {
     fn on_inotify_dev_input(&self, paths: &[PathBuf]) {
         let mut grabbed_devices = self.grabbed_devices.write().unwrap();
-        let is_uinput_device = grabbed_devices
-            .iter()
-            .any(|(_, device)| paths.contains(&device.uinput.devnode().unwrap().into()));
+        let is_uinput_device =
+            grabbed_devices
+                .iter()
+                .any(|(_, device)| match &device.uinput.devnode() {
+                    None => false,
+                    Some(dev_node) => paths.contains(&dev_node.into()),
+                });
 
         if is_uinput_device {
             return;