aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/dix/ptrveloc.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-07-17 13:20:49 +0200
committermarha <marha@users.sourceforge.net>2013-07-17 13:20:49 +0200
commit1e8e0fecef85725718befab85015da4575f570dc (patch)
treeb0338b4e7c765f9011b1d38820e2aaf9cb19ef04 /xorg-server/dix/ptrveloc.c
parent8a339365f243adb27ac9d417796a4338b1f8ddf6 (diff)
parentf5e157731e6b51421ac89cfefb666b8bbf971b03 (diff)
downloadvcxsrv-1e8e0fecef85725718befab85015da4575f570dc.tar.gz
vcxsrv-1e8e0fecef85725718befab85015da4575f570dc.tar.bz2
vcxsrv-1e8e0fecef85725718befab85015da4575f570dc.zip
Merge remote-tracking branch 'origin/released'
* origin/released: mesa mkfontscale xserver git update 17 Jul 2013
Diffstat (limited to 'xorg-server/dix/ptrveloc.c')
-rw-r--r--xorg-server/dix/ptrveloc.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/xorg-server/dix/ptrveloc.c b/xorg-server/dix/ptrveloc.c
index 844e18538..6d349e089 100644
--- a/xorg-server/dix/ptrveloc.c
+++ b/xorg-server/dix/ptrveloc.c
@@ -254,11 +254,10 @@ AccelSetDecelProperty(DeviceIntPtr dev, Atom atom,
if (checkOnly) {
if (rc)
return rc;
- return (v >= 1.0f) ? Success : BadValue;
+ return (v > 0) ? Success : BadValue;
}
- if (v >= 1.0f)
- vel->const_acceleration = 1 / v;
+ vel->const_acceleration = 1 / v;
return Success;
}