From d1006caf373bef8b02aac690f07d345539a0819a Mon Sep 17 00:00:00 2001
From: Peter Johanson <peter@peterjohanson.com>
Date: Sun, 31 Jul 2022 03:44:57 +0000
Subject: [PATCH] fix(behaviors): Properly clean up timed out hold.

* If our handler dedides our undedided hold-tap,
  return early before continuing.
---
 app/src/behaviors/behavior_hold_tap.c         |  4 ++
 .../combos-and-holdtaps-4/events.patterns     |  1 +
 .../keycode_events.snapshot                   |  4 ++
 .../native_posix_64.keymap                    | 46 +++++++++++++++++++
 4 files changed, 55 insertions(+)
 create mode 100644 app/tests/combo/combos-and-holdtaps-4/events.patterns
 create mode 100644 app/tests/combo/combos-and-holdtaps-4/keycode_events.snapshot
 create mode 100644 app/tests/combo/combos-and-holdtaps-4/native_posix_64.keymap

diff --git a/app/src/behaviors/behavior_hold_tap.c b/app/src/behaviors/behavior_hold_tap.c
index 413806b4..f09006ed 100644
--- a/app/src/behaviors/behavior_hold_tap.c
+++ b/app/src/behaviors/behavior_hold_tap.c
@@ -612,6 +612,10 @@ static int position_state_changed_listener(const zmk_event_t *eh) {
         decide_hold_tap(undecided_hold_tap, HT_TIMER_EVENT);
     }
 
+    if (undecided_hold_tap == NULL) {
+        return ZMK_EV_EVENT_BUBBLE;
+    }
+
     if (!ev->state && find_captured_keydown_event(ev->position) == NULL) {
         // no keydown event has been captured, let it bubble.
         // we'll catch modifiers later in modifier_state_changed_listener
diff --git a/app/tests/combo/combos-and-holdtaps-4/events.patterns b/app/tests/combo/combos-and-holdtaps-4/events.patterns
new file mode 100644
index 00000000..833100f6
--- /dev/null
+++ b/app/tests/combo/combos-and-holdtaps-4/events.patterns
@@ -0,0 +1 @@
+s/.*hid_listener_keycode_//p
\ No newline at end of file
diff --git a/app/tests/combo/combos-and-holdtaps-4/keycode_events.snapshot b/app/tests/combo/combos-and-holdtaps-4/keycode_events.snapshot
new file mode 100644
index 00000000..f84bc761
--- /dev/null
+++ b/app/tests/combo/combos-and-holdtaps-4/keycode_events.snapshot
@@ -0,0 +1,4 @@
+pressed: usage_page 0x07 keycode 0xE1 implicit_mods 0x00 explicit_mods 0x00
+pressed: usage_page 0x07 keycode 0x04 implicit_mods 0x00 explicit_mods 0x00
+released: usage_page 0x07 keycode 0x04 implicit_mods 0x00 explicit_mods 0x00
+released: usage_page 0x07 keycode 0xE1 implicit_mods 0x00 explicit_mods 0x00
diff --git a/app/tests/combo/combos-and-holdtaps-4/native_posix_64.keymap b/app/tests/combo/combos-and-holdtaps-4/native_posix_64.keymap
new file mode 100644
index 00000000..ba6cecc6
--- /dev/null
+++ b/app/tests/combo/combos-and-holdtaps-4/native_posix_64.keymap
@@ -0,0 +1,46 @@
+#include <dt-bindings/zmk/keys.h>
+#include <behaviors.dtsi>
+#include <dt-bindings/zmk/kscan-mock.h>
+
+
+#define ZMK_COMBO(name, combo_bindings, keypos, combo_term) \
+/ { \
+	combos { \
+		compatible = "zmk,combos"; \
+		combo_ ## name { \
+			key-positions = <keypos>; \
+			bindings = <combo_bindings>; \
+			timeout-ms = <combo_term>; \
+		}; \
+	}; \
+};
+
+ZMK_COMBO(qmark, &kp QMARK,     0 3, 30)
+ZMK_COMBO(dllr,  &kp DLLR,      1 3, 50)
+ZMK_COMBO(tilde, &kp TILDE,     3 4, 50)
+
+/ {
+	keymap {
+		compatible = "zmk,keymap";
+		label = "Default keymap";
+
+		default_layer {
+			bindings = <
+			&none         &none
+			&kp A         &mt LSHFT T
+			&none
+			>;
+		};
+	};
+};
+
+&kscan {
+	rows = <3>;
+	columns = <2>;
+	events = <
+	ZMK_MOCK_PRESS(1,1,500)
+	ZMK_MOCK_PRESS(1,0,100)
+	ZMK_MOCK_RELEASE(1,0,500)
+	ZMK_MOCK_RELEASE(1,1,0)
+	>;
+};
\ No newline at end of file