Fix issue when release Alt key before H key

j3soon · Feb 19, 2022 · 2aa14db · 2aa14db
1 parent 45e1cc4
commit 2aa14db
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/speech-to-windows-input/Program.cs b/speech-to-windows-input/Program.cs
@@ -234,9 +234,9 @@ private static bool kbdHook_KeyDownEvent(llc.KeyboardHook sender, uint vkCode, b
         {
             if (vkCode == (uint)Keys.H && !keyHDown)
             {
-                keyHDown = true;
                 if (llc.Keyboard.IsKeyDown((int)Keys.Menu))
                 {
+                    keyHDown = true;
                     ToggleSTT();
                     return true;
                 }
@@ -261,15 +261,15 @@ private static bool kbdHook_KeyDownEvent(llc.KeyboardHook sender, uint vkCode, b
             }
             else if (vkCode >= (uint)Keys.D0 && vkCode <= (uint)Keys.D9 && !keyConfigDown)
             {
-                keyConfigDown = true;
                 if (config.UseSwitchConfigKey && llc.Keyboard.IsKeyDown((int)Keys.Menu))
                 {
+                    keyConfigDown = true;
                     configId = (vkCode - (uint)Keys.D0);
                     shouldReloadConfig = true;
                     return true;
                 }
             }
-            else if (vkCode == (uint)Keys.Escape)
+            else if (vkCode == (uint)Keys.Escape && !injected)
             {
                 if (recognizing)
                 {
@@ -282,7 +282,11 @@ private static bool kbdHook_KeyDownEvent(llc.KeyboardHook sender, uint vkCode, b
         private static bool kbdHook_KeyUpEvent(llc.KeyboardHook sender, uint vkCode, bool injected)
         {
             if (vkCode == (uint)Keys.H && keyHDown)
+            {
                 keyHDown = false;
+                if (!llc.Keyboard.IsKeyDown((int)Keys.Menu))
+                    llc.Keyboard.SendKey((int)Keys.Escape);
+            }
             else if (vkCode == (uint)Keys.Apps && keyAppsDown)
             {
                 if (config.UseMenuKey)
@@ -300,7 +304,11 @@ private static bool kbdHook_KeyUpEvent(llc.KeyboardHook sender, uint vkCode, boo
                 }
             }
             else if (vkCode >= (uint)Keys.D0 && vkCode <= (uint)Keys.D9 && keyConfigDown)
+            {
                 keyConfigDown = false;
+                if (!llc.Keyboard.IsKeyDown((int)Keys.Menu))
+                    llc.Keyboard.SendKey((int)Keys.Escape);
+            }
             return false;
         }
         private static String GetCommonPrefix(String s1, String s2)