From b96a02bd6076f4c404146c01b23956bf40b34142 Mon Sep 17 00:00:00 2001
From: Jeremy <jeremy24wu@gmail.com>
Date: Tue, 13 Jul 2021 07:46:39 +1000
Subject: [PATCH] add last query mode update to SetCustomPluginHotkey

---
 Flow.Launcher/Helper/HotKeyMapper.cs | 42 +++++++++++++++++-----------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/Flow.Launcher/Helper/HotKeyMapper.cs b/Flow.Launcher/Helper/HotKeyMapper.cs
index 503a110e0..93bc25bbb 100644
--- a/Flow.Launcher/Helper/HotKeyMapper.cs
+++ b/Flow.Launcher/Helper/HotKeyMapper.cs
@@ -57,22 +57,7 @@ namespace Flow.Launcher.Helper
         {
             if (!ShouldIgnoreHotkeys())
             {
-                if (settings.LastQueryMode == LastQueryMode.Empty)
-                {
-                    mainViewModel.ChangeQueryText(string.Empty);
-                }
-                else if (settings.LastQueryMode == LastQueryMode.Preserved)
-                {
-                    mainViewModel.LastQuerySelected = true;
-                }
-                else if (settings.LastQueryMode == LastQueryMode.Selected)
-                {
-                    mainViewModel.LastQuerySelected = false;
-                }
-                else
-                {
-                    throw new ArgumentException($"wrong LastQueryMode: <{settings.LastQueryMode}>");
-                }
+                UpdateLastQUeryMode();
 
                 mainViewModel.ToggleFlowLauncher();
                 e.Handled = true;
@@ -87,6 +72,25 @@ namespace Flow.Launcher.Helper
             return settings.IgnoreHotkeysOnFullscreen && WindowsInteropHelper.IsWindowFullscreen();
         }
 
+        private static void UpdateLastQUeryMode()
+        {
+            switch(settings.LastQueryMode)
+            {
+                case LastQueryMode.Empty:
+                    mainViewModel.ChangeQueryText(string.Empty);
+                    break;
+                case LastQueryMode.Preserved:
+                    mainViewModel.LastQuerySelected = true;
+                    break;
+                case LastQueryMode.Selected:
+                    mainViewModel.LastQuerySelected = false;
+                    break;
+                default:
+                    throw new ArgumentException($"wrong LastQueryMode: <{settings.LastQueryMode}>");
+
+            }
+        }
+
         private static void SetCustomPluginHotkey()
         {
             if (settings.CustomPluginHotkeys == null) return;
@@ -94,7 +98,11 @@ namespace Flow.Launcher.Helper
             {
                 SetHotkey(hotkey.Hotkey, (s, e) =>
                 {
-                    if (ShouldIgnoreHotkeys()) return;
+                    if (ShouldIgnoreHotkeys())
+                        return;
+
+                    UpdateLastQUeryMode();
+
                     mainViewModel.MainWindowVisibility = Visibility.Visible;
                     mainViewModel.ChangeQueryText(hotkey.ActionKeyword);
                 });