diff options
author | Adam YH Lee <adam.yh.lee@gmail.com> | 2017-04-16 15:20:31 -0700 |
---|---|---|
committer | Adam YH Lee <adam.yh.lee@gmail.com> | 2017-04-16 15:20:31 -0700 |
commit | 9d4050586d24cdfbe5257c094fbb6c1be51f176f (patch) | |
tree | 8cf123260835331d75d02c5b15d0fb39ceba3256 /tmk_core/common/action.c | |
parent | 7e930626eb5f69d6a4de0594c6f5930334d801f8 (diff) | |
parent | b5e8327755100252060afbd54e16322522b4f1e9 (diff) |
Merge branch 'master' into layouts/adam-lee
Diffstat (limited to 'tmk_core/common/action.c')
-rw-r--r-- | tmk_core/common/action.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tmk_core/common/action.c b/tmk_core/common/action.c index 94de36918d..4ba1cc251a 100644 --- a/tmk_core/common/action.c +++ b/tmk_core/common/action.c @@ -140,7 +140,6 @@ void process_record(keyrecord_t *record) void process_action(keyrecord_t *record, action_t action) { - bool do_release_oneshot = false; keyevent_t event = record->event; #ifndef NO_ACTION_TAPPING uint8_t tap_count = record->tap.count; @@ -152,6 +151,7 @@ void process_action(keyrecord_t *record, action_t action) } #ifndef NO_ACTION_ONESHOT + bool do_release_oneshot = false; // notice we only clear the one shot layer if the pressed key is not a modifier. if (is_oneshot_layer_active() && event.pressed && !IS_MOD(action.key.code)) { clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED); |