diff options
| author | Florian Didron <fdidron@users.noreply.github.com> | 2019-04-18 09:58:13 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-18 09:58:13 +0900 |
| commit | 362eaec0a3abf54ff661c72c4144837a6f32aee5 (patch) | |
| tree | 425ac8a1d3a1adc527bbcecc084a866cc0580bbc | |
| parent | 54a7f66aee4cbb8400b49e4dfad4b1126cc71fb9 (diff) | |
| parent | 12c061118929179ebd2c3088141a6fb3d949ac9c (diff) | |
Merge pull request #11 from ErgoDox-EZ/fix/combo_logic
Fixes logic for Combo Feature
| -rw-r--r-- | changelog.md | 5 | ||||
| -rw-r--r-- | quantum/process_keycode/process_combo.c | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/changelog.md b/changelog.md index d4842e2b9e..f77962d384 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,4 @@ -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) +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-12-2019 - Enhancement for Eager debouncing (and Ergodox EZ host sleep fix) (qmk#5621) +04-16-2019 - Fix logic for Combo feature (qmk#5610) 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) { |