summaryrefslogtreecommitdiff
path: root/tmk_core/common
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-02-28 04:48:45 +0000
committerQMK Bot <hello@qmk.fm>2021-02-28 04:48:45 +0000
commit00cb9029f583172cb57f7d51d64793a9c9869d67 (patch)
tree5b9ea3ea9bfa06e9ed71bd3857f3dbf8081ca554 /tmk_core/common
parent72abf868702918fbb6945d06dee2e1afb8c033c8 (diff)
parent765d8a33ddb46ae25314189b80f6ba04136ec808 (diff)
downloadqmk_firmware-00cb9029f583172cb57f7d51d64793a9c9869d67.tar.gz
qmk_firmware-00cb9029f583172cb57f7d51d64793a9c9869d67.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'tmk_core/common')
-rw-r--r--tmk_core/common/action.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/tmk_core/common/action.c b/tmk_core/common/action.c
index f53e3c7084..aae5cbfa5f 100644
--- a/tmk_core/common/action.c
+++ b/tmk_core/common/action.c
@@ -76,6 +76,11 @@ void action_exec(keyevent_t event) {
#endif
}
+ if (event.pressed) {
+ // clear the potential weak mods left by previously pressed keys
+ clear_weak_mods();
+ }
+
#ifdef SWAP_HANDS_ENABLE
if (!IS_NOEVENT(event)) {
process_hand_swap(&event);
@@ -237,11 +242,6 @@ void process_action(keyrecord_t *record, action_t action) {
uint8_t tap_count = record->tap.count;
#endif
- if (event.pressed) {
- // clear the potential weak mods left by previously pressed keys
- clear_weak_mods();
- }
-
#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.