diff options
| author | jpetermans <tibcmhhm@gmail.com> | 2017-05-08 15:24:50 -0700 |
|---|---|---|
| committer | jpetermans <tibcmhhm@gmail.com> | 2017-05-08 15:24:50 -0700 |
| commit | 967cf0f6d43bd05c9951c7c31190971acd0799ea (patch) | |
| tree | 34ff786a7e5177c6edc48e93b69ce71132cb3cbf /tmk_core/common/action.c | |
| parent | 5df74f3ba73f18f6bbd13b82a3a960c86fa592e1 (diff) | |
| parent | 153eb95ab208cf5563ce2fae7ec68981b64d11ce (diff) | |
| download | firmware-967cf0f6d43bd05c9951c7c31190971acd0799ea.tar.gz firmware-967cf0f6d43bd05c9951c7c31190971acd0799ea.tar.bz2 firmware-967cf0f6d43bd05c9951c7c31190971acd0799ea.zip | |
Merge remote-tracking branch 'upstream/master' into user_led_configuration
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 94de36918..4ba1cc251 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); |