From 637c276070dcaa09fc2dc0f771330a5928ac172c Mon Sep 17 00:00:00 2001 From: Bob Date: Sun, 14 Apr 2019 14:02:41 -0400 Subject: [PATCH 1/2] fix combo enabling logic (#5610) --- quantum/process_keycode/process_combo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/quantum/process_keycode/process_combo.c b/quantum/process_keycode/process_combo.c index a157ed48be..2c6c9d0d5f 100644 --- a/quantum/process_keycode/process_combo.c +++ b/quantum/process_keycode/process_combo.c @@ -126,13 +126,13 @@ static bool process_single_combo(combo_t *combo, uint16_t keycode, bool process_combo(uint16_t keycode, keyrecord_t *record) { bool is_combo_key = false; drop_buffer = false; - bool no_combo_keys_pressed = false; + bool no_combo_keys_pressed = true; for (current_combo_index = 0; current_combo_index < COMBO_COUNT; ++current_combo_index) { combo_t *combo = &key_combos[current_combo_index]; is_combo_key |= process_single_combo(combo, keycode, record); - no_combo_keys_pressed |= NO_COMBO_KEYS_ARE_DOWN; + no_combo_keys_pressed = no_combo_keys_pressed && NO_COMBO_KEYS_ARE_DOWN; } if (drop_buffer) { From e26b21baf4831567eb5a1d19faa43af4f3c1b62d Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Tue, 16 Apr 2019 18:18:15 -0700 Subject: [PATCH 2/2] Update changelog.md --- changelog.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/changelog.md b/changelog.md index c98f3c3a72..1eeccc6f0c 100644 --- a/changelog.md +++ b/changelog.md @@ -1,2 +1,3 @@ -04-12-2019 - Add AltGr/RALT support to Send String #4046 -04-12-2019 - Port DIRECT_PINS from split_common/matrix.c to matrix.c (qmk#5091) \ No newline at end of file +04-12-2019 - Add AltGr/RALT support to Send String (qmk#4046) +04-12-2019 - Port DIRECT_PINS from split_common/matrix.c to matrix.c (qmk#5091) +04-16-2019 - Fix logic for Combo feature (qmk#5610)