From 4435bdec3c76fa3c975237343a0c2934ea041f03 Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Tue, 19 Jul 2022 19:45:30 +0200 Subject: [PATCH] Fix a crash when there is no briefing text --- .../Widgets/Logic/Ingame/GameInfoBriefingLogic.cs | 2 +- OpenRA.Mods.Common/Widgets/Logic/MissionBrowserLogic.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoBriefingLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoBriefingLogic.cs index b4f3bb9df6..d173a76c69 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoBriefingLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoBriefingLogic.cs @@ -29,7 +29,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic var missionData = world.Map.Rules.Actors[SystemActors.World].TraitInfoOrDefault(); if (missionData != null) { - var text = WidgetUtils.WrapText(missionData.Briefing.Replace("\\n", "\n"), mapDescription.Bounds.Width, mapFont); + var text = WidgetUtils.WrapText(missionData.Briefing?.Replace("\\n", "\n"), mapDescription.Bounds.Width, mapFont); mapDescription.Text = text; mapDescription.Bounds.Height = mapFont.Measure(text).Y; mapDescriptionPanel.ScrollToTop(); diff --git a/OpenRA.Mods.Common/Widgets/Logic/MissionBrowserLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/MissionBrowserLogic.cs index ca83cf0740..0f7a667b6d 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/MissionBrowserLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/MissionBrowserLogic.cs @@ -234,7 +234,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic infoVideo = missionData.BackgroundVideo; infoVideoVisible = infoVideo != null; - var briefing = WidgetUtils.WrapText(missionData.Briefing.Replace("\\n", "\n"), description.Bounds.Width, descriptionFont); + var briefing = WidgetUtils.WrapText(missionData.Briefing?.Replace("\\n", "\n"), description.Bounds.Width, descriptionFont); var height = descriptionFont.Measure(briefing).Y; Game.RunAfterTick(() => {