wayland.pointer_constraints: Remove constraints in the destructor (#1568

)
Smithay · Oct 25, 2024 · 6ccbe9d · 6ccbe9d
1 parent de5ad9e
commit 6ccbe9d
Showing 1 changed file with 28 additions and 6 deletions.
diff --git a/src/wayland/pointer_constraints.rs b/src/wayland/pointer_constraints.rs
@@ -482,12 +482,23 @@ where
                     }
                 });
             }
-            zwp_confined_pointer_v1::Request::Destroy => {
-                remove_constraint(&data.surface, pointer);
-            }
+            zwp_confined_pointer_v1::Request::Destroy => {}
             _ => unreachable!(),
         }
     }
+
+    fn destroyed(
+        _state: &mut D,
+        _client: wayland_server::backend::ClientId,
+        _resource: &ZwpConfinedPointerV1,
+        data: &PointerConstraintUserData<D>,
+    ) {
+        let Some(pointer) = &data.pointer else {
+            return;
+        };
+
+        remove_constraint(&data.surface, pointer);
+    }
 }
 
 impl<D> Dispatch<ZwpLockedPointerV1, PointerConstraintUserData<D>, D> for PointerConstraintsState
@@ -524,12 +535,23 @@ where
                     }
                 });
             }
-            zwp_locked_pointer_v1::Request::Destroy => {
-                remove_constraint(&data.surface, pointer);
-            }
+            zwp_locked_pointer_v1::Request::Destroy => {}
             _ => unreachable!(),
         }
     }
+
+    fn destroyed(
+        _state: &mut D,
+        _client: wayland_server::backend::ClientId,
+        _resource: &ZwpLockedPointerV1,
+        data: &PointerConstraintUserData<D>,
+    ) {
+        let Some(pointer) = &data.pointer else {
+            return;
+        };
+
+        remove_constraint(&data.surface, pointer);
+    }
 }
 
 #[allow(missing_docs)]