summaryrefslogtreecommitdiff
path: root/tmk_core
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2017-05-30 11:46:34 -0400
committerJack Humbert <jack.humb@gmail.com>2017-05-30 11:46:34 -0400
commit3a1a7d647283681be4681990619061249717a99a (patch)
treed5f7e045651c1640cf46aefef865985347268665 /tmk_core
parent7eccbfe73764dbac0c33065394a8b86c4952eabf (diff)
parent732a115b32a9c6aa529c53ef52a9689b5901411d (diff)
Merge branch 'master' of https://github.com/qmk/qmk_firmware
Diffstat (limited to 'tmk_core')
-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