Fix a crash with support powers and units without selection decorations

2020-06-02 11:57:11 +02:00
parent 534b09ae4a
commit fb27a25e52
2 changed files with 9 additions and 6 deletions
--- a/OpenRA.Mods.Common/Traits/SupportPowers/GrantExternalConditionPower.cs
+++ b/OpenRA.Mods.Common/Traits/SupportPowers/GrantExternalConditionPower.cs
@@ -155,8 +155,9 @@ namespace OpenRA.Mods.Common.Traits
 				foreach (var unit in power.UnitsInRange(xy))
 				{
 					var decorations = unit.TraitsImplementing<ISelectionDecorations>().FirstEnabledTraitOrDefault();
-					foreach (var d in decorations.RenderSelectionAnnotations(unit, wr, Color.Red))
-						yield return d;
+					if (decorations != null)
+						foreach (var d in decorations.RenderSelectionAnnotations(unit, wr, Color.Red))
+							yield return d;
 				}
 			}