From 94d9238ff9aab4273dc32a222034b93ee1d26723 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 4 May 2013 11:00:49 +0200 Subject: [PATCH] fixes #3198 by catching the null references completely --- OpenRA.Mods.RA/Widgets/ObserverSupportPowerIconsWidget.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/OpenRA.Mods.RA/Widgets/ObserverSupportPowerIconsWidget.cs b/OpenRA.Mods.RA/Widgets/ObserverSupportPowerIconsWidget.cs index ddfb359214..a95cd6756b 100644 --- a/OpenRA.Mods.RA/Widgets/ObserverSupportPowerIconsWidget.cs +++ b/OpenRA.Mods.RA/Widgets/ObserverSupportPowerIconsWidget.cs @@ -68,10 +68,8 @@ namespace OpenRA.Mods.RA.Widgets foreach (var power in powers) { var item = power.a.Value; - if (item == null) - { + if (item == null || item.Info == null || item.Info.Image == null) continue; - } var sprite = iconSprites[item.Info.Image]; var size = sprite.size / new float2(2, 2); var location = new float2(RenderBounds.Location) + new float2(power.i * (int)size.Length, 0);