From 15bee9bf627deff387aff94f3bd641b03a3386f4 Mon Sep 17 00:00:00 2001 From: PhatPhuckDave Date: Sun, 31 Aug 2025 22:46:50 +0200 Subject: [PATCH] Check for sequence after track --- DD2Switcher/Program.cs | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/DD2Switcher/Program.cs b/DD2Switcher/Program.cs index 6416b8d..e95e617 100644 --- a/DD2Switcher/Program.cs +++ b/DD2Switcher/Program.cs @@ -687,6 +687,18 @@ namespace DD2Switcher { Console.WriteLine($"Current sequence keybind: {SequenceKeybind}"); Console.WriteLine($"Key codes - Pressed: {(int)e.Key}, Expected: {(int)SequenceKeybind}"); + // Cancel sequence mode on any manual window switching + if (CurrentState != SequenceState.INACTIVE && e.Modifiers == KeyModifiers.Alt) { + Console.WriteLine("Manual window switching detected, cancelling sequence mode"); + ExitSequenceMode(); + } + + if (e.Key == Keys.Oemtilde && e.Modifiers == KeyModifiers.Alt && IsCapsLockOn()) { + TrackProcess(); + ToggleCapsLock(); + return; + } + // Check for sequence mode keybind Console.WriteLine( $"Checking sequence keybind - Key: {e.Key} == {SequenceKeybind} = {e.Key == SequenceKeybind}"); @@ -706,17 +718,6 @@ namespace DD2Switcher { $"Sequence keybind check failed - Key match: {e.Key == SequenceKeybind}, Modifiers match: {e.Modifiers == KeyModifiers.NoRepeat}"); } - // Cancel sequence mode on any manual window switching - if (CurrentState != SequenceState.INACTIVE && e.Modifiers == KeyModifiers.Alt) { - Console.WriteLine("Manual window switching detected, cancelling sequence mode"); - ExitSequenceMode(); - } - - if (e.Key == Keys.Oemtilde && e.Modifiers == KeyModifiers.Alt && IsCapsLockOn()) { - TrackProcess(); - ToggleCapsLock(); - return; - } int index; if (e.Key >= Keys.D0 && e.Key <= Keys.D9) {