summaryrefslogtreecommitdiff
path: root/tmk_core/common
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2017-05-29 15:17:38 -0400
committerGitHub <noreply@github.com>2017-05-29 15:17:38 -0400
commit732a115b32a9c6aa529c53ef52a9689b5901411d (patch)
tree85fed418d59825aba744d2d5b9e0c6710187bf41 /tmk_core/common
parent0c351fa98bff6a2e9d3ff30cc19d6b0782b85a62 (diff)
parentb6c60333e48e3ed77d5e8a21a139ce9955977559 (diff)
Merge pull request #1344 from qmk/jackhumbert-patch-1
Re-enable mouse buttons from #1327
Diffstat (limited to 'tmk_core/common')
-rw-r--r--tmk_core/common/action.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/tmk_core/common/action.c b/tmk_core/common/action.c
index f73b0fe807..cffc0b9ebe 100644
--- 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