From d0bbe7da0d37440d316ce5a5a0eae594937d130b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Wed, 8 Jul 2015 10:00:40 +0200 Subject: [PATCH] don't crash when it becomes disabled after activation --- .../Traits/SupportPowers/SupportPowerManager.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/OpenRA.Mods.Common/Traits/SupportPowers/SupportPowerManager.cs b/OpenRA.Mods.Common/Traits/SupportPowers/SupportPowerManager.cs index 7c9dafe0c4..4486b77a6e 100644 --- a/OpenRA.Mods.Common/Traits/SupportPowers/SupportPowerManager.cs +++ b/OpenRA.Mods.Common/Traits/SupportPowers/SupportPowerManager.cs @@ -230,7 +230,9 @@ namespace OpenRA.Mods.Common.Traits if (!Ready) return; - var power = Instances.First(i => !InstanceDisabled(i)); + var power = Instances.FirstOrDefault(i => !InstanceDisabled(i)); + if (power == null) + return; // Note: order.Subject is the *player* actor power.Activate(power.Self, order, manager);