#501 Fix keybind errors found in 1.2.0

Author: leMicin

src/Sidekick.Application/Keybinds/KeybindsExecutor.cs

@@ -103,9 +103,18 @@ private bool KeybindsProvider_OnKeyDown(string arg)
             }
             else
             {
+                // We need to make sure some key combinations make it into the game no matter what
                 Task.Run(async () =>
                 {
-                    await task;
+                    var result = await task;
+
+                    if (!result)
+                    {
+                        Enabled = false;
+                        keybindsProvider.PressKey(arg);
+                        await Task.Delay(200);
+                    }
+
                     Enabled = true;
                 });
             }
@@ -119,10 +128,7 @@ private void ExecuteCustomChat(CustomChatSetting customChatSetting, string input
             {
                 logger.LogInformation($"Keybind detected: {customChatSetting.Key}! Executing the custom chat command '{customChatSetting.ChatCommand}'");
 
-                var task = mediator.Send(new CustomChatCommand(customChatSetting.ChatCommand));
-
-                GetKeybindTask(customChatSetting.Key, input, task);
-                returnTask = task;
+                returnTask = mediator.Send(new CustomChatCommand(customChatSetting.ChatCommand));
             }
         }
 
@@ -135,7 +141,6 @@ private void ExecuteKeybind<TCommand>(string keybind, string input, ref Task<boo
 
                 var task = mediator.Send(new TCommand());
 
-                GetKeybindTask(keybind, input, task);
                 if (returnTask == null)
                 {
                     returnTask = task;
@@ -152,24 +157,6 @@ private void ExecuteKeybind<TCommand>(string keybind, string input, ref Task<boo
             }
         }
 
-        private void GetKeybindTask(string keybind, string input, Task<bool> task)
-        {
-            // We need to make sure some key combinations make it into the game no matter what
-            if (task != null && input == keybind)
-            {
-                Task.Run(async () =>
-                {
-                    if (!await task)
-                    {
-                        Enabled = false;
-                        keybindsProvider.PressKey(keybind);
-                        await Task.Delay(200);
-                        Enabled = true;
-                    }
-                });
-            }
-        }
-
         public void Dispose()
         {
             Dispose(true);

src/Sidekick.Presentation.Wpf/Startup.cs

@@ -26,7 +26,7 @@ public static ServiceProvider InitializeServices(App application)
                     Assembly.Load("Sidekick.Infrastructure"),
                     Assembly.Load("Sidekick.Persistence"),
                     Assembly.Load("Sidekick.Presentation"),
-                    Assembly.Load("Sidekick.Presentation.Wpf"))
+                    Assembly.Load("Sidekick"))
 
                 // Layers
                 .AddSidekickApplication()