From 28262df1e5d301fd6ccd38d20c2c90cc3d64e975 Mon Sep 17 00:00:00 2001
From: abcdefg30 <alphabet@streber24.de>
Date: Fri, 27 Feb 2015 21:38:37 +0100
Subject: [PATCH] Don't crash when selling an actor using OnAllRemovedFromWorld

---
 OpenRA.Mods.Common/Scripting/Global/TriggerGlobal.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/OpenRA.Mods.Common/Scripting/Global/TriggerGlobal.cs b/OpenRA.Mods.Common/Scripting/Global/TriggerGlobal.cs
index d490f9ceb1..e64fe77646 100644
--- 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();