diff options
| author | marha <marha@users.sourceforge.net> | 2012-01-24 08:59:35 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-01-24 08:59:35 +0100 |
| commit | e3a6ca7bffc785a13361efdbf81ef4776c050df0 (patch) | |
| tree | 2277a7dccab07794bd37b255ae6b5e2716e0c855 /xorg-server/dix/grabs.c | |
| parent | 780fcf7fcf5701c79568c95f32823cfa8e564665 (diff) | |
| parent | b683b8f5675e280a6dd4ab82d6b9394182798b55 (diff) | |
| download | vcxsrv-e3a6ca7bffc785a13361efdbf81ef4776c050df0.tar.gz vcxsrv-e3a6ca7bffc785a13361efdbf81ef4776c050df0.tar.bz2 vcxsrv-e3a6ca7bffc785a13361efdbf81ef4776c050df0.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/dix/grabs.c
Diffstat (limited to 'xorg-server/dix/grabs.c')
| -rw-r--r-- | xorg-server/dix/grabs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/xorg-server/dix/grabs.c b/xorg-server/dix/grabs.c index a6351b6e4..710fcb86c 100644 --- a/xorg-server/dix/grabs.c +++ b/xorg-server/dix/grabs.c @@ -194,7 +194,8 @@ UngrabAllDevices(Bool kill_client) PrintDeviceGrabInfo(dev); client = clients[CLIENT_ID(dev->deviceGrab.grab->resource)]; dev->deviceGrab.DeactivateGrab(dev); - if (kill_client) CloseDownClient(client); + if (kill_client) + CloseDownClient(client); } ErrorF("End list of ungrabbed devices\n"); |