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

Fix a crash when version or mod of a replay are null

Browse Source
This commit is contained in:
abcdefg30
2022-09-27 13:51:17 +02:00
committed by Gustas
parent 0d6a7b3c52
commit b2498fec7d
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,10 +23,10 @@ namespace OpenRA.Mods.Common.Widgets.Logic
[TranslationReference] [TranslationReference]
static readonly string IncompatibleReplayPrompt = "incompatible-replay-prompt"; static readonly string IncompatibleReplayPrompt = "incompatible-replay-prompt";
[TranslationReference("version")] [TranslationReference]
static readonly string UnknownVersion = "incompatible-replay-unknown-version"; static readonly string UnknownVersion = "incompatible-replay-unknown-version";
[TranslationReference("mod")] [TranslationReference]
static readonly string UnknownMod = "incompatible-replay-unknown-mod"; static readonly string UnknownMod = "incompatible-replay-unknown-mod";
[TranslationReference("mod")] [TranslationReference("mod")]
@@ -55,11 +55,11 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var version = replayMeta.GameInfo.Version; var version = replayMeta.GameInfo.Version;
if (version == null) if (version == null)
return IncompatibleReplayDialog(UnknownVersion, Translation.Arguments("version", version), modData, onCancel); return IncompatibleReplayDialog(UnknownVersion, null, modData, onCancel);
var mod = replayMeta.GameInfo.Mod; var mod = replayMeta.GameInfo.Mod;
if (mod == null) if (mod == null)
return IncompatibleReplayDialog(UnknownMod, Translation.Arguments("mod", mod), modData, onCancel); return IncompatibleReplayDialog(UnknownMod, null, modData, onCancel);
if (!Game.Mods.ContainsKey(mod)) if (!Game.Mods.ContainsKey(mod))
return IncompatibleReplayDialog(UnvailableMod, Translation.Arguments("mod", mod), modData, onCancel); return IncompatibleReplayDialog(UnvailableMod, Translation.Arguments("mod", mod), modData, onCancel);

5
mods/common/languages/en.ftl
View File

@@ -502,9 +502,8 @@ replay-deletion-failed = Failed to delete replay file '{ $file }'. See the debug
incompatible-replay-title = Incompatible Replay incompatible-replay-title = Incompatible Replay
incompatible-replay-prompt = Replay metadata could not be read. incompatible-replay-prompt = Replay metadata could not be read.
-incompatible-replay-recorded = It was recorded with -incompatible-replay-recorded = It was recorded with
incompatible-replay-unknown-version = { -incompatible-replay-recorded } an unknown version: incompatible-replay-unknown-version = { -incompatible-replay-recorded } an unknown version.
{ $version }. incompatible-replay-unknown-mod = { -incompatible-replay-recorded } an unknown mod.
incompatible-replay-unknown-mod = { -incompatible-replay-recorded } an unknown mod: { $mod }.
incompatible-replay-unavailable-mod = { -incompatible-replay-recorded } an unavailable mod: { $mod }. incompatible-replay-unavailable-mod = { -incompatible-replay-recorded } an unavailable mod: { $mod }.
incompatible-replay-incompatible-version = { -incompatible-replay-recorded } an incompatible version: incompatible-replay-incompatible-version = { -incompatible-replay-recorded } an incompatible version:
{ $version }. { $version }.