diff options
| author | Derek Foreman <derekf@osg.samsung.com> | 2015-07-15 13:00:41 -0500 |
|---|---|---|
| committer | Bryce Harrington <bryce@osg.samsung.com> | 2015-07-16 19:04:19 -0700 |
| commit | f7b2f8b0a694c3baa36bff3510a80f1109940807 (patch) | |
| tree | 035c4e2e9788b078e2693ca52d773800ba5831eb /desktop-shell | |
| parent | 8fbebbd985bf375e3b122d623a28f173bba34327 (diff) | |
| download | weston-f7b2f8b0a694c3baa36bff3510a80f1109940807.tar.gz | |
desktop-shell: Use the grabbed pointer in popup_grab_button
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 <jadahl@gmail.com>
Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
Diffstat (limited to 'desktop-shell')
| -rw-r--r-- | desktop-shell/shell.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); } |