summaryrefslogtreecommitdiff
path: root/quantum
diff options
context:
space:
mode:
authorBen Cooper <63478578+bncpr@users.noreply.github.com>2023-09-25 05:32:20 +0300
committerGitHub <noreply@github.com>2023-09-25 12:32:20 +1000
commit4ebb065f94694b40cadf77808cba946d2fb5bb3c (patch)
tree2cd78a80115d1f343f7454857e18048327caabcd /quantum
parent9d3c0018c118ed2cf5fc251e24774a8c52df09ee (diff)
Fix combo_ref_from_layer respect different default layer [#21780] (#21781)
Diffstat (limited to 'quantum')
-rw-r--r--quantum/process_keycode/process_combo.c2
1 files changed, 1 insertions, 1 deletions
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);