qmk_firmware

commit 4ebb065f94694b40cadf77808cba946d2fb5bb3c
parent 9d3c0018c118ed2cf5fc251e24774a8c52df09ee
Author: Ben Cooper <63478578+bncpr@users.noreply.github.com>
Date:   Mon, 25 Sep 2023 05:32:20 +0300

Fix combo_ref_from_layer respect different default layer [#21780] (#21781)


Diffstat:
M
quantum/process_keycode/process_combo.c
 | 
2
+-

1 file changed, 1 insertion(+), 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);