Merge pull request #7562 from abcdefg30/onSellRemoved

Fix a crash in OnAllRemovedFromWorld
2015-03-01 14:00:25 +01:00
parent 74c22523aa 28262df1e5
commit 61cea23c3c
1 changed files with 4 additions and 3 deletions
--- a/OpenRA.Mods.Common/Scripting/Global/TriggerGlobal.cs
+++ b/OpenRA.Mods.Common/Scripting/Global/TriggerGlobal.cs
@@ -196,7 +196,9 @@ namespace OpenRA.Mods.Common.Scripting
 			{
 				try
 				{
-					group.Remove(m);
+					if (!group.Remove(m))
+						return;
+
 					if (!group.Any())
 					{
 						copy.Call().Dispose();
@@ -259,10 +261,9 @@ namespace OpenRA.Mods.Common.Scripting
 			{
 				try
 				{
-					if (!group.Contains(m))
+					if (!group.Remove(m))
 						return;

-					group.Remove(m);
 					if (!group.Any())
 					{
 						copy.Call().Dispose();