diff options
| author | marha <marha@users.sourceforge.net> | 2012-05-21 09:28:15 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-05-21 09:28:15 +0200 |
| commit | d4b066581bc9a4bf7b0a5ffa11ff0adb47d2075c (patch) | |
| tree | db56fe01d61a824e4bd975cbf8603b11e9c5ecdf /xorg-server/Xi/xiselectev.c | |
| parent | d2dacc6bc44f7dc245dee6e66723013afb49cfb5 (diff) | |
| parent | f543ceaca6820260f15a4eff86938214cf43c7d2 (diff) | |
| download | vcxsrv-d4b066581bc9a4bf7b0a5ffa11ff0adb47d2075c.tar.gz vcxsrv-d4b066581bc9a4bf7b0a5ffa11ff0adb47d2075c.tar.bz2 vcxsrv-d4b066581bc9a4bf7b0a5ffa11ff0adb47d2075c.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'xorg-server/Xi/xiselectev.c')
| -rw-r--r-- | xorg-server/Xi/xiselectev.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xorg-server/Xi/xiselectev.c b/xorg-server/Xi/xiselectev.c index 43a67c833..e7e719d16 100644 --- a/xorg-server/Xi/xiselectev.c +++ b/xorg-server/Xi/xiselectev.c @@ -175,17 +175,17 @@ ProcXISelectEvents(ClientPtr client) if (inputMasks) iclient = inputMasks->inputClients; for (; iclient; iclient = iclient->next) { - DeviceIntPtr dummy; + DeviceIntPtr tmp; if (CLIENT_ID(iclient->resource) == client->index) continue; - dixLookupDevice(&dummy, evmask->deviceid, serverClient, + dixLookupDevice(&tmp, evmask->deviceid, serverClient, DixReadAccess); - if (!dummy) + if (!tmp) return BadImplementation; /* this shouldn't happen */ - if (xi2mask_isset(iclient->xi2mask, dummy, XI_TouchBegin)) + if (xi2mask_isset(iclient->xi2mask, tmp, XI_TouchBegin)) return BadAccess; } } |