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

Fix a crash when there is no briefing text

Browse Source
This commit is contained in:
abcdefg30
2022-07-19 19:45:30 +02:00
committed by Smittytron
parent e00887e4e1
commit 4435bdec3c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoBriefingLogic.cs
View File

@@ -29,7 +29,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var missionData = world.Map.Rules.Actors[SystemActors.World].TraitInfoOrDefault<MissionDataInfo>(); var missionData = world.Map.Rules.Actors[SystemActors.World].TraitInfoOrDefault<MissionDataInfo>();
if (missionData != null) 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.Text = text;
mapDescription.Bounds.Height = mapFont.Measure(text).Y; mapDescription.Bounds.Height = mapFont.Measure(text).Y;
mapDescriptionPanel.ScrollToTop(); mapDescriptionPanel.ScrollToTop();

2
OpenRA.Mods.Common/Widgets/Logic/MissionBrowserLogic.cs
View File

@@ -234,7 +234,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
infoVideo = missionData.BackgroundVideo; infoVideo = missionData.BackgroundVideo;
infoVideoVisible = infoVideo != null; 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; var height = descriptionFont.Measure(briefing).Y;
Game.RunAfterTick(() => Game.RunAfterTick(() =>
{ {