summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dix/events.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/dix/events.c b/dix/events.c
index 50d06c465..d342d3628 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -3243,7 +3243,12 @@ CheckPassiveGrabsOnWindow(
gdev= grab->modifierDevice;
if (grab->coreGrab)
- gdev = GetPairedDevice(device);
+ {
+ if (IsPointerDevice(device))
+ gdev = GetPairedDevice(device);
+ else
+ gdev = device;
+ }
xkbi= gdev->key->xkbInfo;
#endif
tempGrab.modifierDevice = grab->modifierDevice;