From 18ae48670859d05788776e164c65985e3b35a723 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon, 1 Jun 2009 16:06:52 +1000
Subject: [PATCH] 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>
---
 dix/events.c | 3 +++
 1 file changed, 3 insertions(+)

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