don't crash when it becomes disabled after activation

2015-07-08 10:00:40 +02:00
parent 08c6f02b9e
commit d0bbe7da0d
1 changed files with 3 additions and 1 deletions
--- 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);