From b683b8f5675e280a6dd4ab82d6b9394182798b55 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Tue, 24 Jan 2012 08:53:36 +0100
Subject: libX11 mesa xserver git update 24 jan 2012

---
 xorg-server/dix/grabs.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'xorg-server/dix/grabs.c')

diff --git a/xorg-server/dix/grabs.c b/xorg-server/dix/grabs.c
index 701470c83..cc2c946d0 100644
--- a/xorg-server/dix/grabs.c
+++ b/xorg-server/dix/grabs.c
@@ -195,7 +195,8 @@ UngrabAllDevices(Bool kill_client)
         client = clients[CLIENT_ID(dev->deviceGrab.grab->resource)];
         if (!client || client->clientGone)
             dev->deviceGrab.DeactivateGrab(dev);
-        CloseDownClient(client);
+        if (kill_client)
+            CloseDownClient(client);
     }
 
     ErrorF("End list of ungrabbed devices\n");
-- 
cgit v1.2.3