From 97d79dd740ed1ac4eb02b0d4135850f953716278 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 7 Dec 2011 13:54:28 +1000 Subject: dix: compare the grab type, not the tempGrab type No functional change. To get here, GrabMatchesSecond() needs to be TRUE and for that the two grab types must be identical. Signed-off-by: Peter Hutterer Reviewed-by: Chase Douglas --- dix/events.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dix/events.c b/dix/events.c index e94001aec..349d9b4e7 100644 --- a/dix/events.c +++ b/dix/events.c @@ -3816,7 +3816,7 @@ CheckPassiveGrab(DeviceIntPtr device, GrabPtr grab, InternalEvent *event, Since XGrabDeviceButton requires to specify the modifierDevice explicitly, we don't override this choice. */ - if (tempGrab->type < GenericEvent) + if (grab->type < GenericEvent) { grab->device = device; grab->modifierDevice = GetMaster(device, MASTER_KEYBOARD); -- cgit v1.2.3