Merge branch 'master' of https://github.com/qmk/qmk_firmware

qmk · May 30, 2017 · 3a1a7d6 · 3a1a7d6
2 parents 7eccbfe + 732a115
commit 3a1a7d6
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/tmk_core/common/action.c b/tmk_core/common/action.c
@@ -324,9 +324,10 @@ void process_action(keyrecord_t *record, action_t action)
                         tp_buttons |= (1<<2);
                         break;
                     default:
-                        mousekey_on(action.key.code);
-                        mousekey_send();
+                        break;
                 }
+                mousekey_on(action.key.code);
+                mousekey_send();
             } else {
                 switch (action.key.code) {
                     case KC_MS_BTN1:
@@ -339,9 +340,10 @@ void process_action(keyrecord_t *record, action_t action)
                         tp_buttons &= ~(1<<2);
                         break;
                     default:
-                        mousekey_off(action.key.code);
-                        mousekey_send();
+                        break;
                 }
+                mousekey_off(action.key.code);
+                mousekey_send();
             }
             break;
 #endif