Bugfix

Author: VictoriousRaptor

Flow.Launcher.Infrastructure/UserSettings/CustomShortcutModel.cs

@@ -46,7 +46,7 @@ public override int GetHashCode()
         public void Deconstruct(out string key, out string value)
         {
             key = Key;
-            value = Expand();
+            value = Value;
         }
 
         public static implicit operator (string Key, string Value)(CustomShortcutModel shortcut)

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

@@ -8,6 +8,7 @@
 using Flow.Launcher.Plugin.SharedModels;
 using Flow.Launcher;
 using Flow.Launcher.ViewModel;
+
 namespace Flow.Launcher.Infrastructure.UserSettings
 {
     public class Settings : BaseModel

Flow.Launcher/CustomShortcutSetting.xaml.cs

@@ -20,9 +20,10 @@ public CustomShortcutSetting(Settings settings)
             InitializeComponent();
         }
 
-        public CustomShortcutSetting((string, string) shortcut, Settings settings)
+        public CustomShortcutSetting(CustomShortcutModel shortcut, Settings settings)
         {
-            (Key, Value) = shortcut;
+            Key = shortcut.Key;
+            Value = shortcut.Value;
             _settings = settings;
             update = true;
             InitializeComponent();

Flow.Launcher/SettingWindow.xaml

@@ -2131,7 +2131,8 @@
                                             <GridView>
                                                 <GridViewColumn Width="180" Header="{DynamicResource hotkey}">
                                                     <GridViewColumn.CellTemplate>
-                                                        <DataTemplate DataType="userSettings:CustomPluginHotkey">
+                                                        <DataTemplate 
+															="userSettings:CustomPluginHotkey">
                                                             <TextBlock Text="{Binding Hotkey}" />
                                                         </DataTemplate>
                                                     </GridViewColumn.CellTemplate>
@@ -2184,7 +2185,6 @@
                                         BorderThickness="1"
                                         ItemsSource="{Binding ShortCuts}"
                                         SelectedItem="{Binding SelectedCustomShortcut}"
-                                        SelectedIndex="{Binding SelectCustomShortcutIndex}"
                                         Style="{StaticResource {x:Static GridView.GridViewStyleKey}}">
                                         <ListView.View>
                                             <GridView>

Flow.Launcher/SettingWindow.xaml.cs

@@ -411,7 +411,7 @@ private void OnEditCustomShortCutClick(object sender, RoutedEventArgs e)
                 var shortcutSettingWindow = new CustomShortcutSetting(item, settings);
                 if (shortcutSettingWindow.ShowDialog() == true)
                 {
-                    viewModel.EditShortcut(item);
+                    viewModel.EditShortcut(item, shortcutSettingWindow.ShortCut);
                 }
             }
             else

Flow.Launcher/ViewModel/SettingWindowViewModel.cs

@@ -543,18 +543,17 @@ public FamilyTypeface SelectedResultFontFaces
         public CustomPluginHotkey SelectedCustomPluginHotkey { get; set; }
 
         public CustomShortcutModel? SelectedCustomShortcut { get; set; }
-        public int? SelectCustomShortcutIndex { get; set; }
 
         public void AddShortcut(CustomShortcutModel shortcut)
         {
             Settings.CustomShortcuts.Add(shortcut);
             ShortCuts.Add(shortcut);
         }
 
-        public void EditShortcut(CustomShortcutModel shortcut)
+        public void EditShortcut(CustomShortcutModel oldShortcut, CustomShortcutModel newShortcut)
         {
-            Settings.CustomShortcuts[ShortCuts.IndexOf(shortcut)] = shortcut;
-            ShortCuts[ShortCuts.IndexOf(shortcut)] = shortcut;
+            RemoveShortcut(oldShortcut);
+            AddShortcut(newShortcut);
         }
 
         public void RemoveShortcut(CustomShortcutModel shortcut)