summaryrefslogtreecommitdiffstats
path: root/quantum
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-04-25 03:42:04 +0000
committerQMK Bot <hello@qmk.fm>2021-04-25 03:42:04 +0000
commitab6d07b585b229414de606de752ccce39f5fb8d5 (patch)
treefe0e218672e5a6add022a37c614d8881f70874d5 /quantum
parent891d18d3565090abd5f218a8787acc3e25349b73 (diff)
parentda6e888a32a6d9c09a1506e9ae4a59a36f8a5354 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'quantum')
-rw-r--r--quantum/process_keycode/process_tap_dance.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/quantum/process_keycode/process_tap_dance.c b/quantum/process_keycode/process_tap_dance.c
index 138de0eba2..17dc540a64 100644
--- a/quantum/process_keycode/process_tap_dance.c
+++ b/quantum/process_keycode/process_tap_dance.c
@@ -117,6 +117,10 @@ void preprocess_tap_dance(uint16_t keycode, keyrecord_t *record) {
action->state.interrupting_keycode = keycode;
process_tap_dance_action_on_dance_finished(action);
reset_tap_dance(&action->state);
+
+ // Tap dance actions can leave some weak mods active (e.g., if the tap dance is mapped to a keycode with
+ // modifiers), but these weak mods should not affect the keypress which interrupted the tap dance.
+ clear_weak_mods();
}
}
}