[PATCH] xwayland: Remove unneeded double test on confined_pointer

Roman Gilg subdiff at gmail.com
Sat Aug 12 00:18:46 UTC 2017


In xwl_seat_maybe_lock_on_hidden_cursor the confined_pointer is
destroyed in case it exists. We can remove this since we do it in
the subsequent call to xwl_seat_create_pointer_warp_emulator as well.

Signed-off-by: Roman Gilg <subdiff at gmail.com>
---
 hw/xwayland/xwayland-input.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/hw/xwayland/xwayland-input.c b/hw/xwayland/xwayland-input.c
index 92e530d..5f44036 100644
--- a/hw/xwayland/xwayland-input.c
+++ b/hw/xwayland/xwayland-input.c
@@ -2749,9 +2749,6 @@ xwl_seat_maybe_lock_on_hidden_cursor(struct xwl_seat *xwl_seat)
         !xwl_seat->cursor_confinement_window)
         return FALSE;
 
-    if (xwl_seat->confined_pointer)
-        xwl_seat_destroy_confined_pointer(xwl_seat);
-
     xwl_seat_create_pointer_warp_emulator(xwl_seat);
     xwl_pointer_warp_emulator_lock(xwl_seat->pointer_warp_emulator);
     return TRUE;
-- 
2.7.4



More information about the xorg-devel mailing list