From dd3242c87a0a58cba055eb99c0c3fcf03153e4b8 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 14 Dec 2012 11:34:15 +1000 Subject: [PATCH] dix: don't allow overriding a grab with a different type of grab (#58255) If a client has a core grab, don't allow re-grabbing with type XI2, etc. This was the intent of the original commit xorg-server-1.5.99.1-782-g09f9a86, but ineffective. X.Org Bug 58255 Signed-off-by: Peter Hutterer Reviewed-by: Keith Packard --- dix/events.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dix/events.c b/dix/events.c index 31f8d8700..3836d2f17 100644 --- a/dix/events.c +++ b/dix/events.c @@ -5043,7 +5043,7 @@ GrabDevice(ClientPtr client, DeviceIntPtr dev, grab = grabInfo->grab; if (grab && grab->grabtype != grabtype) *status = AlreadyGrabbed; - if (grab && !SameClient(grab, client)) + else if (grab && !SameClient(grab, client)) *status = AlreadyGrabbed; else if ((!pWin->realized) || (confineTo &&