From 1794625cea6a20f011bf0c2aea42b80794ffdb75 Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Thu, 14 Oct 2010 18:02:15 +1300
Subject: [PATCH] #284 double-destroy in same frame fixed

---
 OpenRA.Game/Actor.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/OpenRA.Game/Actor.cs b/OpenRA.Game/Actor.cs
index a169328996..7193c3f270 100755
--- a/OpenRA.Game/Actor.cs
+++ b/OpenRA.Game/Actor.cs
@@ -194,6 +194,8 @@ namespace OpenRA
 		{
 			World.AddFrameEndTask( w =>
 			{
+				if (Destroyed || !IsInWorld) return;
+
 				World.Remove( this );
 				World.traitDict.RemoveActor( this );
 				Destroyed = true;