From a7cc11f625f2c65afc73ea9726835763fba6d715 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Mon, 25 May 2015 16:35:02 +0200 Subject: [PATCH] fix a potential NRE --- OpenRA.Mods.Common/Widgets/Logic/ColorPickerLogic.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/OpenRA.Mods.Common/Widgets/Logic/ColorPickerLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/ColorPickerLogic.cs index ed0b9efb87..26fa32c46b 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/ColorPickerLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/ColorPickerLogic.cs @@ -32,7 +32,9 @@ namespace OpenRA.Mods.Common.Widgets.Logic td.Add(new HideBibPreviewInit()); td.Add(new OwnerInit(world.WorldActor.Owner)); td.Add(new RaceInit(world.WorldActor.Owner.PlayerReference.Race)); - preview.SetPreview(actor, td); + + if (preview != null) + preview.SetPreview(actor, td); var hueSlider = widget.Get("HUE"); var mixer = widget.Get("MIXER");