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

Fix mod switching failing when launchArgs is null.

Browse Source
This commit is contained in:
Paul Chote
2017-02-18 11:27:26 +00:00
parent b0cf90e95b
commit 500da07565
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Game/Game.cs
View File

@@ -470,10 +470,8 @@ namespace OpenRA
{ {
try try
{ {
var argsString = mod.LaunchArgs.Append(launchArguments) var args = launchArguments != null ? mod.LaunchArgs.Append(launchArguments) : mod.LaunchArgs;
.Select(a => "\"" + a + "\"").JoinWith(" "); var p = Process.Start(mod.LaunchPath, args.Select(a => "\"" + a + "\"").JoinWith(" "));
var p = Process.Start(mod.LaunchPath, argsString);
if (p == null || p.HasExited) if (p == null || p.HasExited)
onFailed(); onFailed();
else else
@@ -482,8 +480,10 @@ namespace OpenRA
Exit(); Exit();
} }
} }
catch catch (Exception e)
{ {
Log.Write("debug", "Failed to switch to external mod.");
Log.Write("debug", "Error was: " + e.Message);
onFailed(); onFailed();
} }
} }