From fff28802c2a803525d30cb8cb27c385f3e589f8a Mon Sep 17 00:00:00 2001 From: Ping Cheng Date: Wed, 19 Oct 2011 17:01:08 -0700 Subject: Process pressure only when it is supported normalizePressure crashes if wcmMaxZ is 0. Signed-off-by: Ping Cheng Acked-by: Chris Bagwell Signed-off-by: Peter Hutterer --- src/wcmCommon.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/wcmCommon.c b/src/wcmCommon.c index c3c8907..08b3283 100644 --- a/src/wcmCommon.c +++ b/src/wcmCommon.c @@ -1168,17 +1168,17 @@ static void commonDispatchDevice(WacomCommonPtr common, unsigned int channel, return; } - if (IsPen(priv) || IsTouch(priv)) + if (IsPen(priv)) + common->wcmPenInProx = filtered.proximity; + + if ((IsPen(priv) || IsTouch(priv)) && common->wcmMaxZ) { priv->minPressure = rebasePressure(priv, &filtered); filtered.pressure = normalizePressure(priv, &filtered); if (IsPen(priv)) filtered.buttons = setPressureButton(priv, &filtered); filtered.pressure = applyPressureCurve(priv,&filtered); - if (IsPen(priv)) - common->wcmPenInProx = filtered.proximity; } - else if (IsCursor(priv) && !priv->oldCursorHwProx) { /* initial current max distance for Intuos series */ -- cgit v1.2.3