Kiseki
/
launcher
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases 1 Wiki Activity

fix: bug fixes

This commit is contained in:
rjindael 2023-12-02 21:18:27 -08:00
parent c1545761f6
commit 81446f9286
No known key found for this signature in database
GPG Key ID: D069369C906CCF31
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Kiseki.Launcher.Windows/Bootstrapper.cs
View File

@ -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,
}
};

12
Kiseki.Launcher.Windows/Program.cs
View File

@ -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]));
}

7
Kiseki.Launcher/Web.cs
View File

@ -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}";
}
}