From 5f3563d83e42a8429cac16b568b96d96c8bfb8f1 Mon Sep 17 00:00:00 2001
From: ScottNZ <stealtharcher.scott@gmail.com>
Date: Fri, 31 May 2013 18:10:56 +1200
Subject: [PATCH] Fix #3354: Guard queries trait from destroyed object

---
 OpenRA.Mods.RA/Widgets/WorldCommandWidget.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenRA.Mods.RA/Widgets/WorldCommandWidget.cs b/OpenRA.Mods.RA/Widgets/WorldCommandWidget.cs
index b9c54387ec..7e96ba8847 100644
--- a/OpenRA.Mods.RA/Widgets/WorldCommandWidget.cs
+++ b/OpenRA.Mods.RA/Widgets/WorldCommandWidget.cs
@@ -150,7 +150,7 @@ namespace OpenRA.Mods.RA.Widgets
 
 		bool PerformGuard()
 		{
-			var actors = World.Selection.Actors.Where(a => a.Owner == World.LocalPlayer && a.HasTrait<Guard>());
+			var actors = World.Selection.Actors.Where(a => !a.Destroyed && a.Owner == World.LocalPlayer && a.HasTrait<Guard>());
 
 			if (actors.Any())
 				World.OrderGenerator = new GuardOrderGenerator(actors);