Validate hotkey

VictoriousRaptor · VictoriousRaptor · commit 10fa2f7beb8d · 2023-01-09T21:50:29.000+08:00
diff --git a/Flow.Launcher/HotkeyControl.xaml.cs b/Flow.Launcher/HotkeyControl.xaml.cs
@@ -9,7 +9,6 @@
 using Flow.Launcher.Infrastructure.Hotkey;
 using Flow.Launcher.Plugin;
 using System.Threading;
-using System.Windows.Interop;
 
 namespace Flow.Launcher
 {
@@ -79,7 +78,7 @@ public async Task SetHotkeyAsync(HotkeyModel keyModel, bool triggerValidate = tr
 
             if (triggerValidate)
             {
-                CurrentHotkeyAvailable = CheckHotkeyAvailability();
+                CurrentHotkeyAvailable = CurrentHotkey.CharKey != Key.None && CheckHotkeyAvailability();
                 if (!CurrentHotkeyAvailable)
                 {
                     tbMsg.Foreground = new SolidColorBrush(Colors.Red);

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@`
`9`	`9`	`using Flow.Launcher.Infrastructure.Hotkey;`
`10`	`10`	`using Flow.Launcher.Plugin;`
`11`	`11`	`using System.Threading;`
`12`		`-using System.Windows.Interop;`
`13`	`12`
`14`	`13`	`namespace Flow.Launcher`
`15`	`14`	`{`
`@@ -79,7 +78,7 @@ public async Task SetHotkeyAsync(HotkeyModel keyModel, bool triggerValidate = tr`
`79`	`78`
`80`	`79`	`if (triggerValidate)`
`81`	`80`	`{`
`82`		`- CurrentHotkeyAvailable = CheckHotkeyAvailability();`
	`81`	`+ CurrentHotkeyAvailable = CurrentHotkey.CharKey != Key.None && CheckHotkeyAvailability();`
`83`	`82`	`if (!CurrentHotkeyAvailable)`
`84`	`83`	`{`
`85`	`84`	`tbMsg.Foreground = new SolidColorBrush(Colors.Red);`