From f7b2f8b0a694c3baa36bff3510a80f1109940807 Mon Sep 17 00:00:00 2001 From: Derek Foreman Date: Wed, 15 Jul 2015 13:00:41 -0500 Subject: [PATCH] desktop-shell: Use the grabbed pointer in popup_grab_button MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This should be identical to the pointer in shset->seat. A later patch prevents direct access to seat->pointer, using the known valid pointer in the grab will be nicer than using the getter functions that patch introduces. Reviewed-by: Jonas Ådahl Signed-off-by: Derek Foreman --- desktop-shell/shell.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c index 6915d9c2..5e34ddd5 100644 --- a/desktop-shell/shell.c +++ b/desktop-shell/shell.c @@ -3233,7 +3233,7 @@ popup_grab_button(struct weston_pointer_grab *grab, } } else if (state == WL_POINTER_BUTTON_STATE_RELEASED && (shseat->popup_grab.initial_up || - time - shseat->seat->pointer->grab_time > 500)) { + time - grab->pointer->grab_time > 500)) { popup_grab_end(grab->pointer); }