Merge pull request #2955 from Mailaender/dead-actor-stances-fix

Don't perform keyboard orders on destroyed actors which crashes the game.
This commit is contained in:
Chris Forbes
2013-04-04 13:42:56 -07:00

View File

@@ -92,7 +92,7 @@ namespace OpenRA.Mods.RA.Widgets
void PerformKeyboardOrderOnSelection(Func<Actor, Order> f) void PerformKeyboardOrderOnSelection(Func<Actor, Order> f)
{ {
var orders = World.Selection.Actors var orders = World.Selection.Actors
.Where(a => a.Owner == World.LocalPlayer).Select(f).ToArray(); .Where(a => a.Owner == World.LocalPlayer && !a.Destroyed).Select(f).ToArray();
foreach (var o in orders) World.IssueOrder(o); foreach (var o in orders) World.IssueOrder(o);
World.PlayVoiceForOrders(orders); World.PlayVoiceForOrders(orders);
} }