epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Preserve arguments passed into the windows launcher.

Browse Source
This commit is contained in:
Paul Chote
2018-02-04 11:40:49 +00:00
committed by reaperrr
parent 222d1af706
commit 5737f4f771
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packaging/windows/WindowsLauncher.cs.in
View File

@@ -32,10 +32,10 @@ namespace OpenRA
[STAThread] [STAThread]
static int Main(string[] args) static int Main(string[] args)
{ {
if (args.Any(x => x.Contains("Engine.LaunchPath"))) if (args.Any(x => x.StartsWith("Engine.LaunchPath=", StringComparison.Ordinal)))
return RunGame(args); return RunGame(args);
return RunInnerLauncher(); return RunInnerLauncher(args);
} }
static int RunGame(string[] args) static int RunGame(string[] args)
@@ -57,16 +57,18 @@ namespace OpenRA
} }
} }
static int RunInnerLauncher() static int RunInnerLauncher(string[] args)
{ {
var launcherPath = Assembly.GetExecutingAssembly().Location; var launcherPath = Assembly.GetExecutingAssembly().Location;
var args = new[] { "Engine.LaunchPath=" + launcherPath }; var launcherArgs = args.ToList();
if (!string.IsNullOrEmpty(ModID))
args = args.Append("Game.Mod=" + ModID).ToArray();
args = args.Select(arg => "\"" + arg + "\"").ToArray(); if (!launcherArgs.Any(x => x.StartsWith("Engine.LaunchPath=", StringComparison.Ordinal)))
launcherArgs.Add("Engine.LaunchPath=\"" + launcherPath + "\"");
var psi = new ProcessStartInfo(launcherPath, string.Join(" ", args)); if (!launcherArgs.Any(x => x.StartsWith("Game.Mod=", StringComparison.Ordinal)))
launcherArgs.Add("Game.Mod=" + ModID);
var psi = new ProcessStartInfo(launcherPath, string.Join(" ", launcherArgs));
try try
{ {