Fix layer switching from tap dances by redoing the keymap lookup (#17935)

2022-10-03 12:48:16 +03:00
parent 0e6f191436
commit ca0c12847a
8 changed files with 874 additions and 5 deletions
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -251,7 +251,11 @@ bool process_record_quantum(keyrecord_t *record) {
 #endif

 #ifdef TAP_DANCE_ENABLE
-    preprocess_tap_dance(keycode, record);
+    if (preprocess_tap_dance(keycode, record)) {
+        // The tap dance might have updated the layer state, therefore the
+        // result of the keycode lookup might change.
+        keycode = get_record_keycode(record, true);
+    }
 #endif

    if (!(