Fix mod switching failing when launchArgs is null.

This commit is contained in:
Paul Chote
2017-02-18 11:27:26 +00:00
parent b0cf90e95b
commit 500da07565

View File

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