diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-25 19:39:46 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-25 19:39:46 +0000 |
| commit | 4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05 (patch) | |
| tree | c1e02b9d3509aa97703aa4b540d4cd22ec4600ed /xorg-server/Xi/ungrdev.c | |
| parent | dc3c299dd0995549e2a6973ca0f25b254afd38a5 (diff) | |
| download | vcxsrv-4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05.tar.gz vcxsrv-4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05.tar.bz2 vcxsrv-4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05.zip | |
Added xorg-server-1.6.2.tar.gz
Diffstat (limited to 'xorg-server/Xi/ungrdev.c')
| -rw-r--r-- | xorg-server/Xi/ungrdev.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xorg-server/Xi/ungrdev.c b/xorg-server/Xi/ungrdev.c index 7abb1d061..f6525a287 100644 --- a/xorg-server/Xi/ungrdev.c +++ b/xorg-server/Xi/ungrdev.c @@ -101,12 +101,12 @@ ProcXUngrabDevice(ClientPtr client) rc = dixLookupDevice(&dev, stuff->deviceid, client, DixGetAttrAccess); if (rc != Success) return rc; - grab = dev->grab; + grab = dev->deviceGrab.grab; time = ClientTimeToServerTime(stuff->time); if ((CompareTimeStamps(time, currentTime) != LATER) && - (CompareTimeStamps(time, dev->grabTime) != EARLIER) && - (grab) && SameClient(grab, client)) - (*dev->DeactivateGrab) (dev); + (CompareTimeStamps(time, dev->deviceGrab.grabTime) != EARLIER) && + (grab) && SameClient(grab, client) && !grab->coreGrab) + (*dev->deviceGrab.DeactivateGrab) (dev); return Success; } |