aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/dix
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-01-20 08:40:47 +0100
committermarha <marha@users.sourceforge.net>2012-01-20 09:06:00 +0100
commite72d316876aad2b8c8ea76dd6f09f3f2f92fc562 (patch)
tree1675929e10329d009cecbb77efae887e9d56971d /xorg-server/dix
parent1d7aaf910f3619f6400908f72276fac5ac25c675 (diff)
downloadvcxsrv-e72d316876aad2b8c8ea76dd6f09f3f2f92fc562.tar.gz
vcxsrv-e72d316876aad2b8c8ea76dd6f09f3f2f92fc562.tar.bz2
vcxsrv-e72d316876aad2b8c8ea76dd6f09f3f2f92fc562.zip
UngrabAllDevices: only close client when kill_client is set to TRUE
make sure the ungrab happens
Diffstat (limited to 'xorg-server/dix')
-rw-r--r--xorg-server/dix/grabs.c5
1 files 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");