Fixed a crash on empty mission options.

kkpan11 · Jul 5, 2024 · 387554a · 387554a
1 parent 446d37b
commit 387554a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/OpenRA.Mods.Common/Widgets/Logic/MissionBrowserLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/MissionBrowserLogic.cs
@@ -45,6 +45,9 @@ enum PanelType { MissionInfo, Options }
 		[TranslationReference]
 		const string CantPlayCancel = "dialog-cant-play-video.cancel";
 
+		[TranslationReference]
+		const string NotAvailable = "label-not-available";
+
 		readonly ModData modData;
 		readonly Action onStart;
 		readonly Widget missionDetail;
@@ -379,7 +382,14 @@ void RebuildOptions()
 
 				var dropdown = dropdownColumns.Dequeue();
 
-				dropdown.GetText = () => option.Values[missionOptions[option.Id]];
+				dropdown.GetText = () =>
+				{
+					if (option.Values.TryGetValue(missionOptions[option.Id], out var value))
+						return value;
+
+					return TranslationProvider.GetString(NotAvailable);
+				};
+
 				if (option.Description != null)
 				{
 					var (text, desc) = LobbyUtils.SplitOnFirstToken(option.Description);

diff --git a/mods/common/languages/en.ftl b/mods/common/languages/en.ftl
@@ -349,7 +349,7 @@ options-slot-admin =
 button-general-chat = All
 button-team-chat = Team
 
-## LobbyOptionsLogic
+## LobbyOptionsLogic, MissionBrowserLogic
 label-not-available = Not Available
 
 ## LobbyUtils