From ce60f414dd9e33c63073aabe293400109f2f5b4c Mon Sep 17 00:00:00 2001 From: Vic <10308169+VictoriousRaptor@users.noreply.github.com> Date: Sat, 15 Oct 2022 14:29:19 +0800 Subject: [PATCH] bugfix --- .../UserSettings/CustomShortcutModel.cs | 2 +- Flow.Launcher.Infrastructure/UserSettings/Settings.cs | 2 +- Flow.Launcher/ViewModel/SettingWindowViewModel.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Flow.Launcher.Infrastructure/UserSettings/CustomShortcutModel.cs b/Flow.Launcher.Infrastructure/UserSettings/CustomShortcutModel.cs index a2a7100d4..dcb466538 100644 --- a/Flow.Launcher.Infrastructure/UserSettings/CustomShortcutModel.cs +++ b/Flow.Launcher.Infrastructure/UserSettings/CustomShortcutModel.cs @@ -12,7 +12,7 @@ namespace Flow.Launcher.Infrastructure.UserSettings public override bool Equals(object obj) { - return obj is CustomShortcutModel other && + return obj is ShortcutBaseModel other && Key == other.Key; } diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs index 5829fe540..2dd7a4fe9 100644 --- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs +++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs @@ -181,7 +181,7 @@ namespace Flow.Launcher.Infrastructure.UserSettings [JsonIgnore] public ObservableCollection BuiltinShortcuts { get; set; } = new ObservableCollection() { - new BuiltinShortcutModel("{clipboard}", "Get text from clipboard.", Clipboard.GetText) + new BuiltinShortcutModel("{clipboard}", "Get text from clipboard.", Clipboard.GetText) // TODO: translation? }; public bool DontPromptUpdateMsg { get; set; } diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs index 9e23ec4df..c15ac0ab0 100644 --- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs +++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs @@ -537,7 +537,7 @@ namespace Flow.Launcher.ViewModel #endregion - #region hotkey & shortcut + #region hotkey public CustomPluginHotkey SelectedCustomPluginHotkey { get; set; }