1 files changed, 7 insertions, 1 deletions
diff --git a/src/evdev.c b/src/evdev.c
index 80ba276..a9e1d27 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1466,8 +1466,14 @@ EvdevProbe(InputInfoPtr pInfo)
     /* count all buttons */
     for (i = BTN_MISC; i < BTN_JOYSTICK; i++)
     {
+        int mapping = 0;
         if (TestBit(i, pEvdev->key_bitmask))
-            num_buttons++;
+        {
+            mapping =
+                pEvdev->btnmap[EvdevUtilButtonEventToButtonNumber(pEvdev, i)];
+            if (mapping > num_buttons)
+                num_buttons = mapping;
+        }
     }
 
     if (num_buttons)