Adjust gamepad disconnect behavior

servo · Feb 12, 2024 · dd0a268 · dd0a268
1 parent 237f537
commit dd0a268
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/components/script/dom/gamepadlist.rs b/components/script/dom/gamepadlist.rs
@@ -46,7 +46,7 @@ impl GamepadList {
     }
 
     pub fn remove_gamepad(&self, index: usize) {
-        self.list.borrow_mut().remove(index).update_connected(false);
+        self.list.borrow_mut().remove(index);
     }
 }
 

diff --git a/components/script/dom/globalscope.rs b/components/script/dom/globalscope.rs
@@ -3166,7 +3166,8 @@ impl GlobalScope {
                     let global = this.root();
                     if let Some(window) = global.downcast::<Window>() {
                         let gamepad_list = window.Navigator().GetGamepads();
-                        if gamepad_list.Length() > 0 {
+                        if let Some(gamepad) = gamepad_list.Item(index as u32) {
+                            gamepad.update_connected(false);
                             gamepad_list.remove_gamepad(index);
                         }
                     }