From b8f3651d353389bfce2b837f20511a1857e65b26 Mon Sep 17 00:00:00 2001
From: Manna Harbour <51143715+manna-harbour@users.noreply.github.com>
Date: Mon, 26 Oct 2020 15:06:15 +1100
Subject: [PATCH] Deactivate after bilateral combination

---
 docs/tap_hold.md         | 2 +-
 tmk_core/common/action.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/tap_hold.md b/docs/tap_hold.md
index 42697692385f..9fc1c952e1c9 100644
--- a/docs/tap_hold.md
+++ b/docs/tap_hold.md
@@ -181,7 +181,7 @@ For instance, holding and releasing `LT(2, KC_SPACE)` without hitting another ke
 
 ## Bilateral Combinations
 
-The last mod-tap hold will be converted to the corresponding mod-tap tap if another key on the same hand is tapped during the hold.
+The last mod-tap hold will be converted to the corresponding mod-tap tap if another key on the same hand is tapped during the hold, unless a key on the other hand is tapped first.
 
 This option can be used to prevent accidental modifier combinations with mod-tap, in particular those caused by rollover on home row mods.  As only the last mod-tap hold is affected, it should be enabled after adjusting settings and typing style so that accidental mods happen only occasionally, e.g. with a long enough tapping term, ignore mod tap interrupt, and deliberately brief keypresses.
 
diff --git a/tmk_core/common/action.c b/tmk_core/common/action.c
index f1965528272f..ed0890c8b51b 100644
--- a/tmk_core/common/action.c
+++ b/tmk_core/common/action.c
@@ -280,8 +280,8 @@ static void bilateral_combinations_tap(keyevent_t event) {
             dprint("BILATERAL_COMBINATIONS: change\n");
             unregister_mods(bilateral_combinations.mods);
             tap_code(bilateral_combinations.tap);
-            bilateral_combinations.active = false;
         }
+        bilateral_combinations.active = false;
     }
 }
 #endif