summaryrefslogtreecommitdiff
path: root/src/eventcomm.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/eventcomm.c')
-rw-r--r--src/eventcomm.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/eventcomm.c b/src/eventcomm.c
index 361f878..9d1233c 100644
--- a/src/eventcomm.c
+++ b/src/eventcomm.c
@@ -627,11 +627,6 @@ static int count_fingers(InputInfoPtr pInfo, const struct CommData *comm)
struct eventcomm_proto_data *proto_data = priv->proto_data;
int fingers = 0;
-#ifdef HAVE_MULTITOUCH
- if (priv->has_touch)
- return proto_data->num_touches;
-#endif
-
if (comm->oneFinger)
fingers = 1;
else if (comm->twoFingers)
@@ -639,6 +634,11 @@ static int count_fingers(InputInfoPtr pInfo, const struct CommData *comm)
else if (comm->threeFingers)
fingers = 3;
+#ifdef HAVE_MULTITOUCH
+ if (priv->has_touch && proto_data->num_touches > fingers)
+ fingers = proto_data->num_touches;
+#endif
+
return fingers;
}