Fix combo_ref_from_layer respect different default layer [qmk#21780] (q…

…mk#21781)
zgagnon · Dec 15, 2023 · 2f01122 · 2f01122
1 parent 7754f14
commit 2f01122
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/quantum/process_keycode/process_combo.c b/quantum/process_keycode/process_combo.c
@@ -557,7 +557,7 @@ bool process_combo(uint16_t keycode, keyrecord_t *record) {
     /* Only check keycodes from one layer. */
     keycode = keymap_key_to_keycode(COMBO_ONLY_FROM_LAYER, record->event.key);
 #else
-    uint8_t  highest_layer = get_highest_layer(layer_state);
+    uint8_t  highest_layer = get_highest_layer(layer_state | default_layer_state);
     uint8_t  ref_layer     = combo_ref_from_layer(highest_layer);
     if (ref_layer != highest_layer) {
         keycode = keymap_key_to_keycode(ref_layer, record->event.key);