diff options
author | 2017-04-29 15:03:52 +0200 | |
---|---|---|
committer | 2017-04-29 15:03:52 +0200 | |
commit | 584b804ee33d53102fef3b8cdd045bca4c47bf26 (patch) | |
tree | cccdc512fed02293ffd0bfb962ec14d8a8664e7f /tmk_core/common/action.c | |
parent | 215dd126d08b29939c53bf0eaa006ce6ecdedb83 (diff) | |
parent | 26bbfd78125224abdbd2e4ccf3aa3df1b5fc4968 (diff) | |
download | qmk_firmware-584b804ee33d53102fef3b8cdd045bca4c47bf26.tar.gz |
Merge pull request #21 from qmk/master
Merge from QMK
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); |