From 7b7bcf1005c7a08d8ef35378dd68c7b5027690cc Mon Sep 17 00:00:00 2001
From: geckosoft <tv2knet@gmail.com>
Date: Mon, 22 Nov 2010 17:20:00 +0100
Subject: [PATCH] Fixed: Crash when selling iron curtained' buildings

---
 OpenRA.Mods.RA/Effects/InvulnEffect.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/OpenRA.Mods.RA/Effects/InvulnEffect.cs b/OpenRA.Mods.RA/Effects/InvulnEffect.cs
index c2d8fa0bc9..242038bb59 100644
--- a/OpenRA.Mods.RA/Effects/InvulnEffect.cs
+++ b/OpenRA.Mods.RA/Effects/InvulnEffect.cs
@@ -27,12 +27,15 @@ namespace OpenRA.Mods.RA.Effects
 
 		public void Tick( World world )
 		{
-			if (a.IsDead() || b.GetDamageModifier(null, null) > 0)
+			if (a.Destroyed || a.IsDead() || b.GetDamageModifier(null, null) > 0)
 				world.AddFrameEndTask(w => w.Remove(this));
 		}
 
 		public IEnumerable<Renderable> Render()
 		{
+			if (a.Destroyed) // Tick will clean up
+				yield break;
+
 			foreach (var r in a.Render())
 				yield return r.WithPalette("invuln");
 		}