diff --git a/Kiseki.Launcher.Windows/Bootstrapper.cs b/Kiseki.Launcher.Windows/Bootstrapper.cs index 492de3e..95ce8ef 100644 --- a/Kiseki.Launcher.Windows/Bootstrapper.cs +++ b/Kiseki.Launcher.Windows/Bootstrapper.cs @@ -245,7 +245,7 @@ public class Bootstrapper : Interfaces.IBootstrapper StartInfo = new() { FileName = Path.Combine(Paths.Versions, Arguments["Version"], $"{Constants.PROJECT_NAME}.Player.exe"), - Arguments = $"-a \"{Web.FormatUrl("/Login/Negotiate.ashx")}\" -t \"{Arguments["Ticket"]}\" -j \"{Arguments["JoinScript"]}\" ", + Arguments = $"-a \"{Web.FormatUrl("/Login/Negotiate.ashx", null, true)}\" -t \"{Arguments["Ticket"]}\" -j \"{Arguments["JoinScript"]}\" ", UseShellExecute = true, } }; diff --git a/Kiseki.Launcher.Windows/Program.cs b/Kiseki.Launcher.Windows/Program.cs index 66e3d9b..66d6d96 100644 --- a/Kiseki.Launcher.Windows/Program.cs +++ b/Kiseki.Launcher.Windows/Program.cs @@ -7,6 +7,12 @@ internal static class Program [STAThread] static void Main(string[] args) { + if (args.Length > 0 && args[0] == "-uninstall") + { + Bootstrapper.Uninstall(args[0] == "-quiet"); + return; + } + // Initialize directories if (Path.GetFileName(Path.GetDirectoryName(Application.ExecutablePath))!.ToLower().Contains(Constants.PROJECT_NAME.ToLower())) { @@ -62,12 +68,6 @@ internal static class Program return; } - if (args[0] == "-uninstall") - { - Bootstrapper.Uninstall(args[0] == "-quiet"); - return; - } - ApplicationConfiguration.Initialize(); Application.Run(new MainWindow(args[0])); } diff --git a/Kiseki.Launcher/Web.cs b/Kiseki.Launcher/Web.cs index 12cbe42..60d41f0 100644 --- a/Kiseki.Launcher/Web.cs +++ b/Kiseki.Launcher/Web.cs @@ -59,7 +59,7 @@ public static class Web return response?.Status ?? HealthCheckStatus.Failure; } - public static string FormatUrl(string path, string? subdomain = null) + public static string FormatUrl(string path, string? subdomain = null, bool forceHttp = false) { string scheme = "https"; string url = subdomain == null ? CurrentUrl! : $"{subdomain!}.{CurrentUrl!}"; @@ -68,6 +68,11 @@ public static class Web scheme = "http"; #endif + if (forceHttp) + { + scheme = "http"; + } + return $"{scheme}://{url}{path}"; } } \ No newline at end of file