Signed-off-by: Peter Hutterer <[email protected]>
---
src/wcmCommon.c | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/wcmCommon.c b/src/wcmCommon.c
index 758af4c..520d449 100644
--- a/src/wcmCommon.c
+++ b/src/wcmCommon.c
@@ -1136,14 +1136,12 @@ static void commonDispatchDevice(WacomCommonPtr common,
unsigned int channel,
button = 1;
priv = pDev->private;
- if (IsUSBDevice(common) && IsTouch(priv) && !ds->proximity)
+ if (IsUSBDevice(common))
{
- priv->hardProx = 0;
- }
-
- if (IsUSBDevice(common) && (IsStylus(priv) || IsEraser(priv)))
- {
- priv->hardProx = 1;
+ if (IsTouch(priv) && !ds->proximity)
+ priv->hardProx = 0;
+ else if (IsStylus(priv) || IsEraser(priv))
+ priv->hardProx = 1;
}
/* send a touch out for USB Tablet PCs */
--
1.7.3.4
------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Linuxwacom-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
