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

Merge pull request #8254 from Mailaender/colorpicker-preview-nre

Browse Source 
Fixed a null reference exception in ColorPickerLogic when deciding not to use a ActorPreviewWidget
This commit is contained in:
abcdefg30
2015-05-25 17:00:38 +02:00
parent 9ec7f00635 a7cc11f625
commit 0a60b78bec
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Common/Widgets/Logic/ColorPickerLogic.cs
View File

@@ -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<SliderWidget>("HUE");
var mixer = widget.Get<ColorMixerWidget>("MIXER");