From 4ebb065f94694b40cadf77808cba946d2fb5bb3c Mon Sep 17 00:00:00 2001 From: Ben Cooper <63478578+bncpr@users.noreply.github.com> Date: Mon, 25 Sep 2023 05:32:20 +0300 Subject: Fix combo_ref_from_layer respect different default layer [#21780] (#21781) --- quantum/process_keycode/process_combo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'quantum') diff --git a/quantum/process_keycode/process_combo.c b/quantum/process_keycode/process_combo.c index 64d30fc140..b0034d136a 100644 --- 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); -- cgit v1.2.3