diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2012-12-20 16:25:43 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2013-01-21 13:52:47 +1000 |
| commit | 66299cb7b850bc9260ad4b5c03e8720e3baeea98 (patch) | |
| tree | 6547f60ebd81c94efe1f5573774ef6e44194a381 | |
| parent | 7c859fd5d1528fd5ea6816224cb9e22f0df0ee25 (diff) | |
dix: check for the right device's xi2 mask
events.c: In function 'DeactivatePointerGrab':
events.c:1524:51: warning: 'dev' may be used uninitialized in this function
[-Wuninitialized
dev is unset when we get here, the device to check is "mouse".
Introduced in ece8157a59751b3ed492fb2e1eb8d5f20221e195.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 32a6d8a6b59c42f8d65002d7ca1cafb1957b656f)
| -rw-r--r-- | dix/events.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dix/events.c b/dix/events.c index f45e0fbd3..47ba1663f 100644 --- a/dix/events.c +++ b/dix/events.c @@ -1519,7 +1519,7 @@ DeactivatePointerGrab(DeviceIntPtr mouse) emulate a ButtonRelease here. So pretend the listener already has the end event */ if (grab->grabtype == CORE || grab->grabtype == XI || - !xi2mask_isset(dev->deviceGrab.grab->xi2mask, dev, XI_TouchBegin)) + !xi2mask_isset(mouse->deviceGrab.grab->xi2mask, mouse, XI_TouchBegin)) ti->listeners[0].state = LISTENER_HAS_END; TouchListenerAcceptReject(mouse, ti, 0, XIRejectTouch); } |