summaryrefslogtreecommitdiffstats
path: root/quantum
diff options
context:
space:
mode:
authorBob <rsheldiii@gmail.com>2019-04-14 20:02:41 +0200
committerDrashna Jaelre <drashna@live.com>2019-04-14 20:02:41 +0200
commit02b74d521bf84ba776a5920289887ad418806311 (patch)
tree6144cd445153e4d9fea66e21b874e18363fabfd6 /quantum
parent61a7aebd1630b35e177dcd4e49694756593428a1 (diff)
downloadqmk_firmware-02b74d521bf84ba776a5920289887ad418806311.tar.gz
qmk_firmware-02b74d521bf84ba776a5920289887ad418806311.tar.xz
fix combo enabling logic (#5610)
Diffstat (limited to 'quantum')
-rw-r--r--quantum/process_keycode/process_combo.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/quantum/process_keycode/process_combo.c b/quantum/process_keycode/process_combo.c
index a157ed48b..2c6c9d0d5 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) {