Henry-Hiles/qmk_userspace
1
0
Fork 0
forked from mirrors/qmk_userspace
Code Pull requests Activity

Merge remote-tracking branch 'upstream/master' into develop

Browse source
This commit is contained in:
Nick Brassel 2023-09-25 12:34:48 +10:00
commit 1fb02d5ad8
No known key found for this signature in database
9 changed files with 435 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
quantum/process_keycode/process_combo.c
View file

@ -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);