diff options
| author | marha <marha@users.sourceforge.net> | 2013-07-17 13:20:49 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-07-17 13:20:49 +0200 |
| commit | 1e8e0fecef85725718befab85015da4575f570dc (patch) | |
| tree | b0338b4e7c765f9011b1d38820e2aaf9cb19ef04 /xorg-server/dix | |
| parent | 8a339365f243adb27ac9d417796a4338b1f8ddf6 (diff) | |
| parent | f5e157731e6b51421ac89cfefb666b8bbf971b03 (diff) | |
| download | vcxsrv-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')
| -rwxr-xr-x | xorg-server/dix/events.c | 3 | ||||
| -rw-r--r-- | xorg-server/dix/ptrveloc.c | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/xorg-server/dix/events.c b/xorg-server/dix/events.c index a77415377..b2b770d1c 100755 --- a/xorg-server/dix/events.c +++ b/xorg-server/dix/events.c @@ -1444,7 +1444,8 @@ UpdateTouchesForGrab(DeviceIntPtr mouse) listener->type = LISTENER_POINTER_GRAB; else listener->type = LISTENER_GRAB; - FreeGrab(listener->grab); + if (listener->grab) + FreeGrab(listener->grab); listener->grab = AllocGrab(grab); } } 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; } |