Merge pull request #5798 from Mailaender/td-production-tooltip-nre

Fixed a crash in Tiberian Dawn when a production tooltip is being rendered while the last accompanying production queue is destroyed.
This commit is contained in:
Paul Chote
2014-07-05 10:58:13 +12:00

View File

@@ -66,7 +66,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
powerLabel.IsVisible = () => power != 0;
var lowpower = pm.PowerState != PowerState.Normal;
var time = palette.CurrentQueue.GetBuildTime(actor)
var time = palette.CurrentQueue == null ? 0 : palette.CurrentQueue.GetBuildTime(actor)
* (lowpower ? palette.CurrentQueue.Info.LowPowerSlowdown : 1);
var timeString = "T: {0}".F(WidgetUtils.FormatTime(time));
timeLabel.GetText = () => timeString;