summaryrefslogtreecommitdiff
path: root/dix/events.c
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-06-01 16:06:52 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-06-02 10:41:10 +1000
commit18ae48670859d05788776e164c65985e3b35a723 (patch)
tree342eeab8e408ce82e3e1792dc2976e3e5cd6a17d /dix/events.c
parentff1d6244eba8367a8d50601ca393e951c60c94b6 (diff)
dix: don't try to activate a passive grab on top of an active one.
If we already have an active grab on the device, don't attempt to activate another one. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'dix/events.c')
-rw-r--r--dix/events.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/dix/events.c b/dix/events.c
index 229e67d36..3fd1dab06 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -3393,6 +3393,9 @@ CheckPassiveGrabsOnWindow(
#define XI2_MATCH 0x4
int match = 0;
+ if (device->deviceGrab.grab)
+ return FALSE;
+
if (!grab)
return FALSE;
/* Fill out the grab details, but leave the type for later before