From 5c4e49cc3fa22de02328168128061fd84eb09889 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Thu, 21 Jun 2012 09:33:47 +1200 Subject: [PATCH] fix #2196 - crash when cycling stances while a unit dies --- OpenRA.Mods.RA/Widgets/WorldCommandWidget.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenRA.Mods.RA/Widgets/WorldCommandWidget.cs b/OpenRA.Mods.RA/Widgets/WorldCommandWidget.cs index d0f36d99c8..17a1c57747 100644 --- a/OpenRA.Mods.RA/Widgets/WorldCommandWidget.cs +++ b/OpenRA.Mods.RA/Widgets/WorldCommandWidget.cs @@ -125,7 +125,7 @@ namespace OpenRA.Mods.RA.Widgets bool PerformStanceCycle() { var actor = World.Selection.Actors - .Where(a => a.Owner == World.LocalPlayer) + .Where(a => a.Owner == World.LocalPlayer && !a.Destroyed) .Select(a => Pair.New( a, a.TraitOrDefault() )) .Where(a => a.Second != null).FirstOrDefault(); @@ -184,4 +184,4 @@ namespace OpenRA.Mods.RA.Widgets return true; } } -} \ No newline at end of file +}