Merge pull request #7562 from abcdefg30/onSellRemoved

Fix a crash in OnAllRemovedFromWorld
This commit is contained in:
Oliver Brakmann
2015-03-01 14:00:25 +01:00

View File

@@ -196,7 +196,9 @@ namespace OpenRA.Mods.Common.Scripting
{ {
try try
{ {
group.Remove(m); if (!group.Remove(m))
return;
if (!group.Any()) if (!group.Any())
{ {
copy.Call().Dispose(); copy.Call().Dispose();
@@ -259,10 +261,9 @@ namespace OpenRA.Mods.Common.Scripting
{ {
try try
{ {
if (!group.Contains(m)) if (!group.Remove(m))
return; return;
group.Remove(m);
if (!group.Any()) if (!group.Any())
{ {
copy.Call().Dispose(); copy.Call().Dispose();