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

Merge pull request #12038 from pchote/fix-readfailure-crash

Browse Source 
Don't crash if a replay can't be read.
This commit is contained in:
reaperrr
2016-09-18 15:22:38 +02:00
committed by GitHub
parent 1079adcf2b 9063e44f9b
commit 32e54cd30c
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/LoadScreens/BlankLoadScreen.cs
View File

@@ -77,7 +77,13 @@ namespace OpenRA.Mods.Common.LoadScreens
// Load a replay directly // Load a replay directly
if (!string.IsNullOrEmpty(Launch.Replay)) if (!string.IsNullOrEmpty(Launch.Replay))
{ {
var replayMeta = ReplayMetadata.Read(Launch.Replay); ReplayMetadata replayMeta = null;
try
{
replayMeta = ReplayMetadata.Read(Launch.Replay);
}
catch { }
if (ReplayUtils.PromptConfirmReplayCompatibility(replayMeta, Game.LoadShellMap)) if (ReplayUtils.PromptConfirmReplayCompatibility(replayMeta, Game.LoadShellMap))
Game.JoinReplay(Launch.Replay); Game.JoinReplay(Launch.Replay);

5
OpenRA.Mods.Common/Widgets/Logic/ReplayUtils.cs
View File

@@ -24,7 +24,10 @@ namespace OpenRA.Mods.Common.Widgets.Logic
onCancel = DoNothing; onCancel = DoNothing;
if (replayMeta == null) if (replayMeta == null)
return IncompatibleReplayDialog("outdated engine", null, onCancel); {
ConfirmationDialogs.ButtonPrompt("Incompatible Replay", "Replay metadata could not be read.", onCancel: onCancel);
return false;
}
var version = replayMeta.GameInfo.Version; var version = replayMeta.GameInfo.Version;
if (version == null) if (version == null)