From db3099ed0efb4f374e7e8e3c0f83c6384716bd29 Mon Sep 17 00:00:00 2001
From: Jeremy <jeremy24wu@gmail.com>
Date: Wed, 13 Oct 2021 09:07:27 +1100
Subject: [PATCH] fix bookmark plugin browser edit button logic

---
 .../Views/CustomBrowserSetting.xaml              |  4 ++--
 .../Views/CustomBrowserSetting.xaml.cs           | 16 +++++++++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml
index 8c77c5ec2..ff3fbb38e 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml
@@ -31,8 +31,8 @@
         <TextBox Grid.Row="1" Grid.Column="1" Text="{Binding DataDirectoryPath}"
                    HorizontalAlignment="Left" VerticalAlignment="Center" Width="200" Height="30" Margin="50 0 0 0"/>
         <StackPanel HorizontalAlignment="Center" Grid.Row="2" Orientation="Horizontal" Grid.Column="1" Height="70">
-            <Button Content="Confirm" Margin="15" Click="ConfirmEditCustomBrowser"/>
-            <Button Content="Cancel" Margin="15"/>
+            <Button Name="btnConfirm" Content="Confirm" Margin="15" Click="ConfirmCancelEditCustomBrowser"/>
+            <Button Content="Cancel" Margin="15" Click="ConfirmCancelEditCustomBrowser"/>
         </StackPanel>
     </Grid>
 </Window>
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml.cs
index 8ec9e3a64..b243878f7 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml.cs
@@ -31,20 +31,26 @@ namespace Flow.Launcher.Plugin.BrowserBookmark.Views
             };
         }
 
-        private void ConfirmEditCustomBrowser(object sender, RoutedEventArgs e)
+        private void ConfirmCancelEditCustomBrowser(object sender, RoutedEventArgs e)
         {
-            if (DataContext is CustomBrowser editedBrowser)
+            if (DataContext is CustomBrowser editBrowser && e.Source is Button button)
             {
-                currentCustomBrowser.Name = editedBrowser.Name;
-                currentCustomBrowser.DataDirectoryPath = editedBrowser.DataDirectoryPath;
+                if (button.Name == "btnConfirm")
+                {
+                    currentCustomBrowser.Name = editBrowser.Name;
+                    currentCustomBrowser.DataDirectoryPath = editBrowser.DataDirectoryPath;
+                    Close();
+                }
             }
+
             Close();
         }
+
         private void WindowKeyDown(object sender, KeyEventArgs e)
         {
             if (e.Key == Key.Enter)
             {
-                ConfirmEditCustomBrowser(sender, e);
+                ConfirmCancelEditCustomBrowser(sender, e);
             }
         }
     }