1 files changed, 1 insertions, 6 deletions
diff --git a/src/evdev.c b/src/evdev.c
index 27d75dc..05eb760 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -226,6 +226,7 @@ EvdevReadInput(InputInfoPtr pInfo)
                     xf86PostButtonEvent(pInfo->dev, 0, 3, value, 0, 0);
                 break;
             case BTN_MIDDLE:
+                EvdevMBEmuEnable(pInfo, FALSE);
                 xf86PostButtonEvent(pInfo->dev, 0, 2, value, 0, 0);
                 break;
 
@@ -943,12 +944,6 @@ EvdevProbe(InputInfoPtr pInfo)
 	has_buttons = TRUE;
     }
 
-    if (TestBit(BTN_MIDDLE, key_bitmask)) {
-        xf86Msg(X_INFO, "%s: Found middle button. Disabling emulation.\n",
-                pInfo->name);
-        EvdevMBEmuEnable(pInfo, FALSE);
-    }
-
     for (i = 0; i < BTN_MISC; i++)
         if (TestBit(i, key_bitmask))
             break;