fix(Manager): Don't retain references to dead targets.

ShadowBlip · Feb 11, 2025 · ac77700 · ac77700
1 parent d42b6fd
commit ac77700
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/src/input/manager.rs b/src/input/manager.rs
@@ -346,6 +346,13 @@ impl Manager {
                         continue;
                     };
 
+                    self.composite_device_targets
+                        .entry(device_path.clone())
+                        .and_modify(|paths| {
+                            paths.remove(&path);
+                        });
+                    log::debug!("Used target devices: {:?}", self.composite_device_targets);
+
                     let is_suspended = match device.is_suspended().await {
                         Ok(suspended) => suspended,
                         Err(e) => {
@@ -366,12 +373,6 @@ impl Manager {
                         .filter(|paf| paf.as_str() != device_path.as_str())
                         .collect();
                     log::info!("Gamepad order: {:?}", self.target_gamepad_order);
-
-                    self.composite_device_targets
-                        .entry(device_path)
-                        .and_modify(|paths| {
-                            paths.remove(&path);
-                        });
                 }
                 ManagerCommand::DeviceAdded { device } => {
                     let dev_name = device.name();
@@ -686,7 +687,7 @@ impl Manager {
                 paths.insert(target_path.to_string());
                 paths
             });
-        log::trace!("Used target devices: {:?}", self.composite_device_targets);
+        log::debug!("Used target devices: {:?}", self.composite_device_targets);
 
         log::debug!("Finished handling attach request for: {target_path}");