Evaluate read only dictionaries.

OpenRA · Aug 6, 2023 · db3145e · db3145e
1 parent e49135b
commit db3145e
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/OpenRA.Mods.Common/Widgets/Logic/Settings/DisplaySettingsLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Settings/DisplaySettingsLogic.cs
@@ -11,6 +11,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
 using OpenRA.Graphics;
 using OpenRA.Mods.Common.Traits;
@@ -510,8 +511,9 @@ static void RecalculateWidgetLayout(Widget w, bool insideScrollPanel = false)
 				{ "PARENT_BOTTOM", parentBounds.Height }
 			};
 
-			var width = w.Width.Evaluate(substitutions);
-			var height = w.Height.Evaluate(substitutions);
+			var readOnlySubstitutions = new ReadOnlyDictionary<string, int>(substitutions);
+			var width = w.Width != null ? w.Width.Evaluate(readOnlySubstitutions) : 0;
+			var height = w.Height != null ? w.Height.Evaluate(readOnlySubstitutions) : 0;
 
 			substitutions.Add("WIDTH", width);
 			substitutions.Add("HEIGHT", height);
@@ -520,8 +522,8 @@ static void RecalculateWidgetLayout(Widget w, bool insideScrollPanel = false)
 				w.Bounds = new Rectangle(w.Bounds.X, w.Bounds.Y, width, w.Bounds.Height);
 			else
 				w.Bounds = new Rectangle(
-					w.X.Evaluate(substitutions),
-					w.Y.Evaluate(substitutions),
+					w.X != null ? w.X.Evaluate(readOnlySubstitutions) : 0,
+					w.Y != null ? w.Y.Evaluate(readOnlySubstitutions) : 0,
 					width,
 					height);