Merge pull request #11 from ErgoDox-EZ/fix/combo_logic

Fixes logic for Combo Feature
drashna · Apr 18, 2019 · 362eaec · 362eaec
2 parents 54a7f66 + 12c0611
commit 362eaec
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -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) {