diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2017-05-29 15:17:38 -0400 | 
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-29 15:17:38 -0400 | 
| commit | 732a115b32a9c6aa529c53ef52a9689b5901411d (patch) | |
| tree | 85fed418d59825aba744d2d5b9e0c6710187bf41 /tmk_core | |
| parent | 0c351fa98bff6a2e9d3ff30cc19d6b0782b85a62 (diff) | |
| parent | b6c60333e48e3ed77d5e8a21a139ce9955977559 (diff) | |
| download | firmware-732a115b32a9c6aa529c53ef52a9689b5901411d.tar.gz firmware-732a115b32a9c6aa529c53ef52a9689b5901411d.tar.bz2 firmware-732a115b32a9c6aa529c53ef52a9689b5901411d.zip | |
Merge pull request #1344 from qmk/jackhumbert-patch-1
Re-enable mouse buttons from #1327
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/common/action.c | 10 | 
1 files changed, 6 insertions, 4 deletions
| diff --git a/tmk_core/common/action.c b/tmk_core/common/action.c index f73b0fe80..cffc0b9eb 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 | 
