summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dix/grabs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/dix/grabs.c b/dix/grabs.c
index 55bf64f2c..fe7967415 100644
--- a/dix/grabs.c
+++ b/dix/grabs.c
@@ -179,7 +179,7 @@ UngrabAllDevices(Bool kill_client)
continue;
PrintDeviceGrabInfo(dev);
client = clients[CLIENT_ID(dev->deviceGrab.grab->resource)];
- if (!client || client->clientGone)
+ if (!kill_client || !client || client->clientGone)
dev->deviceGrab.DeactivateGrab(dev);
if (kill_client)
CloseDownClient(client);