summaryrefslogtreecommitdiff
path: root/quantum
diff options
context:
space:
mode:
authorNick Brassel <nick@tzarc.org>2023-09-25 12:34:48 +1000
committerNick Brassel <nick@tzarc.org>2023-09-25 12:34:48 +1000
commit1fb02d5ad87e69d459ae63235bbb3057083866ef (patch)
treedbaff204657253b22732f8092036e556b596ba8b /quantum
parenta360900fbb87cec0aa721d527b251a3dcc72c671 (diff)
parent131bc92b7723d38015e7e82b7dccd773c90f7818 (diff)
Merge remote-tracking branch 'upstream/master' into develop
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);