From 068a96fd460b4f0f2bfceecfc9db9ffa4d85a2e7 Mon Sep 17 00:00:00 2001
From: WolfGaming <rikki96@simnet.is>
Date: Sat, 7 Mar 2015 21:09:29 +0000
Subject: [PATCH] Fixes NullPointerException when frozen.Actor is null.

---
 OpenRA.Game/Widgets/ViewportControllerWidget.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/OpenRA.Game/Widgets/ViewportControllerWidget.cs b/OpenRA.Game/Widgets/ViewportControllerWidget.cs
index 888b56e52b..f1c3d436ed 100644
--- a/OpenRA.Game/Widgets/ViewportControllerWidget.cs
+++ b/OpenRA.Game/Widgets/ViewportControllerWidget.cs
@@ -93,6 +93,7 @@ namespace OpenRA.Widgets
 		public void UpdateMouseover()
 		{
 			TooltipType = WorldTooltipType.None;
+			ActorTooltipExtra = null;
 			var cell = worldRenderer.Viewport.ViewToWorld(Viewport.LastMousePos);
 			if (!world.Map.Contains(cell))
 				return;
@@ -122,7 +123,8 @@ namespace OpenRA.Widgets
 			if (frozen != null)
 			{
 				FrozenActorTooltip = frozen;
-				ActorTooltipExtra = frozen.Actor.TraitsImplementing<IProvideTooltipInfo>();
+				if (frozen.Actor != null)
+					ActorTooltipExtra = frozen.Actor.TraitsImplementing<IProvideTooltipInfo>();
 				TooltipType = WorldTooltipType.FrozenActor;
 			}
 		}