]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
fix combo enabling logic (#5610)
authorBob <rsheldiii@gmail.com>
Sun, 14 Apr 2019 18:02:41 +0000 (14:02 -0400)
committerDrashna Jaelre <drashna@live.com>
Sun, 14 Apr 2019 18:02:41 +0000 (11:02 -0700)
quantum/process_keycode/process_combo.c

index a157ed48be1dfdba3f8848f26090ae4d23b31ed4..2c6c9d0d5f65ded8a907914f962fd6a60e29b42d 100644 (file)
@@ -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) {