From db13255dc8d037b1638d0cb67f21bb1abc4e1807 Mon Sep 17 00:00:00 2001 From: verhoek <30193551+verhoek@users.noreply.github.com> Date: Tue, 12 Feb 2019 21:47:17 +0100 Subject: [PATCH] Extracted function. --- Duplicati/GUI/Duplicati.GUI.TrayIcon/Program.cs | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Program.cs b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Program.cs index 044729f51..802176a56 100644 --- a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Program.cs +++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Program.cs @@ -76,7 +76,7 @@ namespace Duplicati.GUI.TrayIcon if (Platform.IsClientWindows && (Duplicati.Library.AutoUpdater.UpdaterManager.IsRunningInUpdateEnvironment || !Duplicati.Library.Utility.Utility.ParseBoolOption(options, DETACHED_PROCESS))) Duplicati.Library.Utility.Win32.AttachConsole(Duplicati.Library.Utility.Win32.ATTACH_PARENT_PROCESS); - + foreach (string s in args) if ( s.Equals("help", StringComparison.OrdinalIgnoreCase) || @@ -94,7 +94,7 @@ namespace Duplicati.GUI.TrayIcon { Console.WriteLine("--{0}: {1}", arg.Name, arg.LongDescription); if (arg.Name == TOOLKIT_OPTION) - Console.WriteLine(" Supported toolkits: {0}{1}", string.Join(", ", arg.ValidValues), Environment.NewLine); + Console.WriteLine(" Supported toolkits: {0}{1}", string.Join(", ", arg.ValidValues), Environment.NewLine); } Console.WriteLine("Additionally, these server options are also supported:"); @@ -107,7 +107,7 @@ namespace Duplicati.GUI.TrayIcon } options.TryGetValue(BROWSER_COMMAND_OPTION, out _browser_command); - + string toolkit; if (!options.TryGetValue(TOOLKIT_OPTION, out toolkit)) { @@ -117,7 +117,7 @@ namespace Duplicati.GUI.TrayIcon #endif toolkit = GetDefaultToolKit(); } - else + else { if (TOOLKIT_WINDOWS_FORMS.Equals(toolkit, StringComparison.OrdinalIgnoreCase)) toolkit = TOOLKIT_WINDOWS_FORMS; @@ -209,7 +209,12 @@ namespace Duplicati.GUI.TrayIcon if (options.TryGetValue(HOSTURL_OPTION, out url)) serverURL = new Uri(url); - + + StartTray(_args, options, toolkit, hosted, openui, password, saltedpassword, serverURL, disableTrayIconLogin); + } + + private static void StartTray(string[] _args, Dictionary options, string toolkit, HostedInstanceKeeper hosted, bool openui, string password, bool saltedpassword, Uri serverURL, bool disableTrayIconLogin) + { using (hosted) { var reSpawn = 0;