From e72d316876aad2b8c8ea76dd6f09f3f2f92fc562 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 20 Jan 2012 08:40:47 +0100
Subject: UngrabAllDevices: only close client when kill_client is set to TRUE  
                 make sure the ungrab happens

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

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