From f98a55c72f257accaa270617b4630523100a05bb Mon Sep 17 00:00:00 2001
From: Oliver Brakmann <ob-web2013+github@posteo.net>
Date: Sun, 4 Oct 2015 18:44:10 +0200
Subject: [PATCH] Fix H and Home keys not working when the shroud debug option
 is enabled

---
 OpenRA.Mods.Common/Widgets/WorldCommandWidget.cs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/OpenRA.Mods.Common/Widgets/WorldCommandWidget.cs b/OpenRA.Mods.Common/Widgets/WorldCommandWidget.cs
index e2998d2714..3f3af3ccf0 100644
--- a/OpenRA.Mods.Common/Widgets/WorldCommandWidget.cs
+++ b/OpenRA.Mods.Common/Widgets/WorldCommandWidget.cs
@@ -191,8 +191,10 @@ namespace OpenRA.Mods.Common.Widgets
 
 		bool CycleBases()
 		{
+			var player = world.RenderPlayer ?? world.LocalPlayer;
+
 			var bases = world.ActorsWithTrait<BaseBuilding>()
-				.Where(a => a.Actor.Owner == world.RenderPlayer)
+				.Where(a => a.Actor.Owner == player)
 				.Select(b => b.Actor)
 				.ToList();
 
@@ -201,7 +203,7 @@ namespace OpenRA.Mods.Common.Widgets
 			{
 				var building = world.ActorsWithTrait<Building>()
 					.Select(b => b.Actor)
-					.FirstOrDefault(a => a.Owner == world.RenderPlayer && a.Info.HasTraitInfo<SelectableInfo>());
+					.FirstOrDefault(a => a.Owner == player && a.Info.HasTraitInfo<SelectableInfo>());
 
 				// No buildings left
 				if (building == null)
@@ -226,8 +228,10 @@ namespace OpenRA.Mods.Common.Widgets
 
 		bool CycleProductionBuildings()
 		{
+			var player = world.RenderPlayer ?? world.LocalPlayer;
+
 			var facilities = world.ActorsWithTrait<Production>()
-				.Where(a => a.Actor.Owner == world.RenderPlayer && !a.Actor.Info.HasTraitInfo<BaseBuildingInfo>())
+				.Where(a => a.Actor.Owner == player && !a.Actor.Info.HasTraitInfo<BaseBuildingInfo>())
 				.OrderBy(f => f.Actor.Info.TraitInfo<ProductionInfo>().Produces.First())
 				.Select(b => b.Actor)
 				.ToList();