From 98758f60b6a1f92ea13dfdf0121e8782dc40b898 Mon Sep 17 00:00:00 2001
From: Jeremy Wu <jeremy24wu@gmail.com>
Date: Fri, 17 Apr 2020 20:47:56 +1000
Subject: [PATCH] Fix opening web/url/bookmarks in new window and tab

Functionality broken after the upgrade
---
 .../Wox.Plugin.WebSearch/SettingsControl.xaml |  2 +-
 Wox.Plugin/SharedCommands/SearchWeb.cs        | 32 +++++++++++--------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/Plugins/Wox.Plugin.WebSearch/SettingsControl.xaml b/Plugins/Wox.Plugin.WebSearch/SettingsControl.xaml
index 0cc580da0..40752c928 100644
--- a/Plugins/Wox.Plugin.WebSearch/SettingsControl.xaml
+++ b/Plugins/Wox.Plugin.WebSearch/SettingsControl.xaml
@@ -24,7 +24,7 @@
                       SelectedItem="{Binding Settings.SelectedSuggestion}"
                       IsEnabled="{Binding ElementName=EnableSuggestion, Path=IsChecked}" Margin="10,3,10,10" />
             <!-- Not sure why binding IsEnabled directly to Settings.EnableWebSaerchSuggestion is not working -->
-            <Label Content="Open search in:" Margin="40 3 0 8"/>
+            <Label Content="Open search in:" Margin="30 3 0 8"/>
             <RadioButton Name="NewWindowBrowser" GroupName="OpenSearchBehaviour" Content="New window" Click="OnNewBrowserWindowClick" Margin="10" />
             <RadioButton Name="NewTabInBrowser" GroupName="OpenSearchBehaviour" Content="New tab" Click="OnNewTabClick" Margin="10" />
         </StackPanel>
diff --git a/Wox.Plugin/SharedCommands/SearchWeb.cs b/Wox.Plugin/SharedCommands/SearchWeb.cs
index 37ea6a2e7..e1471c038 100644
--- a/Wox.Plugin/SharedCommands/SearchWeb.cs
+++ b/Wox.Plugin/SharedCommands/SearchWeb.cs
@@ -11,7 +11,7 @@ namespace Wox.Plugin.SharedCommands
         /// Opens search in a new browser. If no browser path is passed in then Chrome is used. 
         /// Leave browser path blank to use Chrome.
         /// </summary>
-		public static void NewBrowserWindow(this string url, string browserPath)
+		public static void NewBrowserWindow(this string url, string browserPath = "")
         {
             var browserExecutableName = browserPath?
                                         .Split(new[] { Path.DirectorySeparatorChar }, StringSplitOptions.None)
@@ -22,41 +22,47 @@ namespace Wox.Plugin.SharedCommands
             // Internet Explorer will open url in new browser window, and does not take the --new-window parameter
             var browserArguements = browserExecutableName == "iexplore.exe" ? url : "--new-window " + url;
 
+            var psi = new ProcessStartInfo
+            {
+                FileName = browser,
+                Arguments = browserArguements,
+                UseShellExecute = true
+            };
+
             try
             {
-                Process.Start(browser, browserArguements);
+                Process.Start(psi);
             }
             catch (System.ComponentModel.Win32Exception)
             {
-                var psi = new ProcessStartInfo
-                {
-                    FileName = url,
-                    UseShellExecute = true
-                };
-                Process.Start(psi);
+                Process.Start(new ProcessStartInfo { FileName = url, UseShellExecute = true });
             }
         }
 
         /// <summary> 
         /// Opens search as a tab in the default browser chosen in Windows settings.
         /// </summary>
-        public static void NewTabInBrowser(this string url, string browserPath)
+        public static void NewTabInBrowser(this string url, string browserPath = "")
         {
+            var psi = new ProcessStartInfo() { UseShellExecute = true};
             try
             {
                 if (!string.IsNullOrEmpty(browserPath))
                 {
-                    Process.Start(browserPath, url);
+                    psi.FileName = browserPath;
+                    psi.Arguments = url;
                 }
                 else
                 {
-                    Process.Start(url);
+                    psi.FileName = url;
                 }
+
+                Process.Start(psi);
             }
-            // This error may be thrown for Process.Start(browserPath, url)
+            // This error may be thrown if browser path is incorrect
             catch (System.ComponentModel.Win32Exception)
             {
-                Process.Start(url);
+                Process.Start(new ProcessStartInfo { FileName = url, UseShellExecute = true });
             }
         }
     }