diff options
| author | marha <marha@users.sourceforge.net> | 2010-02-05 14:14:04 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-02-05 14:14:04 +0000 |
| commit | 1cd320f8b4b3d09beb757bea617cac34d36bcb78 (patch) | |
| tree | a61f78d2a77620096f64bcd794ac0021772974ab /xorg-server/dix/getevents.c | |
| parent | 950eb1cc5e0edfc1daf7a69d1803aca794cede14 (diff) | |
| parent | 7fe172c9035f56977209da12a7fd67d8badd71a2 (diff) | |
| download | vcxsrv-1cd320f8b4b3d09beb757bea617cac34d36bcb78.tar.gz vcxsrv-1cd320f8b4b3d09beb757bea617cac34d36bcb78.tar.bz2 vcxsrv-1cd320f8b4b3d09beb757bea617cac34d36bcb78.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/dix/getevents.c')
| -rw-r--r-- | xorg-server/dix/getevents.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/dix/getevents.c b/xorg-server/dix/getevents.c index ca3852a28..8134c4d77 100644 --- a/xorg-server/dix/getevents.c +++ b/xorg-server/dix/getevents.c @@ -304,7 +304,7 @@ updateSlaveDeviceCoords(DeviceIntPtr master, DeviceIntPtr pDev) &pDev->last.remainder[0], NULL, pDev->valuator->axes + 0, scr->width);
if(pDev->valuator->numAxes > 1)
pDev->last.valuators[1] = rescaleValuatorAxis(pDev->last.valuators[1], pDev->last.remainder[1],
- &pDev->last.remainder[0], NULL, pDev->valuator->axes + 1, scr->height);
+ &pDev->last.remainder[1], NULL, pDev->valuator->axes + 1, scr->height);
/* calculate the other axis as well based on info from the old
* slave-device. If the old slave had less axes than this one,
|