From cb1bbefd438c1e758011bb085ccb57e4d74d140c Mon Sep 17 00:00:00 2001 From: masolini Date: Fri, 30 May 2025 19:53:45 +0700 Subject: [PATCH 1/2] Fix OpenURLInBrowser function for Wine --- WikiFunctions/Tools.cs | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/WikiFunctions/Tools.cs b/WikiFunctions/Tools.cs index 3a297ff99..8b6232e4d 100644 --- a/WikiFunctions/Tools.cs +++ b/WikiFunctions/Tools.cs @@ -1576,32 +1576,14 @@ public static void OpenArticleInBrowser(string title) OpenURLInBrowser(Variables.NonPrettifiedURL(title)); } - private static string WineBrowserPath; /// - /// Error supressed URL opener in default browser (Windows) or Firefox/Chromium/Konqueror for Wine + /// Error supressed URL opener in default browser /// public static void OpenURLInBrowser(string url) { - // For Wine use attempt to dynamically determine available browser, caching result - if (WineBrowserPath == null) - { - if (File.Exists("/usr/bin/firefox")) - WineBrowserPath = "/usr/bin/firefox"; - else if (File.Exists("/usr/bin/chromium-browser")) - WineBrowserPath = "/usr/bin/chromium-browser"; - else if (File.Exists("/usr/bin/konqueror")) - WineBrowserPath = "/usr/bin/konqueror"; - else WineBrowserPath = ""; // Windows, or Wine and none of these browsers available - } try { - if (!Globals.UnitTestMode) - { - if (WineBrowserPath.Length > 0) // Wine - System.Diagnostics.Process.Start(WineBrowserPath, url); - else // Windows - System.Diagnostics.Process.Start(url); - } + System.Diagnostics.Process.Start(url); } catch { } } From dda0b0de3cb90b7c9e6a160ded7626e44282f905 Mon Sep 17 00:00:00 2001 From: masolini Date: Sat, 31 May 2025 20:40:13 +0700 Subject: [PATCH 2/2] misc --- WikiFunctions/Tools.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/WikiFunctions/Tools.cs b/WikiFunctions/Tools.cs index 8b6232e4d..79980b745 100644 --- a/WikiFunctions/Tools.cs +++ b/WikiFunctions/Tools.cs @@ -1583,7 +1583,10 @@ public static void OpenURLInBrowser(string url) { try { - System.Diagnostics.Process.Start(url); + if (!Globals.UnitTestMode) + { + System.Diagnostics.Process.Start(url); + } } catch { } }