diff options
| author | Erez Zukerman <bulk@ezuk.org> | 2018-05-15 10:50:24 -0400 |
|---|---|---|
| committer | Erez Zukerman <bulk@ezuk.org> | 2018-05-15 10:50:24 -0400 |
| commit | 5272218ac9cff7ce5af8cfda9129dc03b7aafa49 (patch) | |
| tree | 61ad3987770684afd55cbdd12bca48a221d83713 /tmk_core/common/action.c | |
| parent | 0592d23b74142a554c9e36d2da7bf525fbe3a4c0 (diff) | |
| parent | e41147da929afd15c1088226893cc02537650284 (diff) | |
Merge branch 'master' into hf/shinydox
Diffstat (limited to 'tmk_core/common/action.c')
| -rw-r--r-- | tmk_core/common/action.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tmk_core/common/action.c b/tmk_core/common/action.c index fff8347915..f7c039f457 100644 --- a/tmk_core/common/action.c +++ b/tmk_core/common/action.c @@ -258,10 +258,10 @@ void process_action(keyrecord_t *record, action_t action) if (event.pressed) { if (tap_count == 0) { dprint("MODS_TAP: Oneshot: 0\n"); - register_mods(mods); + register_mods(mods | get_oneshot_mods()); } else if (tap_count == 1) { dprint("MODS_TAP: Oneshot: start\n"); - set_oneshot_mods(mods); + set_oneshot_mods(mods | get_oneshot_mods()); #if defined(ONESHOT_TAP_TOGGLE) && ONESHOT_TAP_TOGGLE > 1 } else if (tap_count == ONESHOT_TAP_TOGGLE) { dprint("MODS_TAP: Toggling oneshot"); @@ -270,7 +270,7 @@ void process_action(keyrecord_t *record, action_t action) register_mods(mods); #endif } else { - register_mods(mods); + register_mods(mods | get_oneshot_mods()); } } else { if (tap_count == 0) { |