diff options
| author | Ben Cooper <63478578+bncpr@users.noreply.github.com> | 2023-09-25 05:32:20 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-25 12:32:20 +1000 |
| commit | 4ebb065f94694b40cadf77808cba946d2fb5bb3c (patch) | |
| tree | 2cd78a80115d1f343f7454857e18048327caabcd /quantum/process_keycode | |
| parent | 9d3c0018c118ed2cf5fc251e24774a8c52df09ee (diff) | |
Fix combo_ref_from_layer respect different default layer [#21780] (#21781)
Diffstat (limited to 'quantum/process_keycode')
| -rw-r--r-- | quantum/process_keycode/process_combo.c | 2 |
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) { | |||
| 557 | /* Only check keycodes from one layer. */ | 557 | /* Only check keycodes from one layer. */ |
| 558 | keycode = keymap_key_to_keycode(COMBO_ONLY_FROM_LAYER, record->event.key); | 558 | keycode = keymap_key_to_keycode(COMBO_ONLY_FROM_LAYER, record->event.key); |
| 559 | #else | 559 | #else |
| 560 | uint8_t highest_layer = get_highest_layer(layer_state); | 560 | uint8_t highest_layer = get_highest_layer(layer_state | default_layer_state); |
| 561 | uint8_t ref_layer = combo_ref_from_layer(highest_layer); | 561 | uint8_t ref_layer = combo_ref_from_layer(highest_layer); |
| 562 | if (ref_layer != highest_layer) { | 562 | if (ref_layer != highest_layer) { |
| 563 | keycode = keymap_key_to_keycode(ref_layer, record->event.key); | 563 | keycode = keymap_key_to_keycode(ref_layer, record->event.key); |