From 8973690c621b22b760b3cfe17f2643480f9bf6fd Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Sun, 6 Dec 2009 21:23:13 +1300
Subject: [PATCH] oops.

---
 OpenRa.Game/Effects/Smoke.cs | 11 ++++++++---
 sequences.xml                |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/OpenRa.Game/Effects/Smoke.cs b/OpenRa.Game/Effects/Smoke.cs
index 21fd4f237c..761f34527c 100644
--- a/OpenRa.Game/Effects/Smoke.cs
+++ b/OpenRa.Game/Effects/Smoke.cs
@@ -10,13 +10,17 @@ namespace OpenRa.Game.Effects
 	{
 		readonly int2 pos;
 		readonly Animation anim = new Animation("smokey");
+		bool removed;
 
 		public Smoke(int2 pos)
 		{
 			this.pos = pos;
 			anim.PlayThen("idle",
-				() => Game.world.AddFrameEndTask(
-					w => w.Remove(this)));
+				() =>
+				{
+					removed = true;
+					Game.world.AddFrameEndTask(w => w.Remove(this));
+				});
 		}
 
 		public void Tick()
@@ -26,7 +30,8 @@ namespace OpenRa.Game.Effects
 
 		public IEnumerable<Tuple<Sprite, float2, int>> Render()
 		{
-			yield return Tuple.New(anim.Image, pos.ToFloat2() - .5f * anim.Image.size, 0);
+			if (!removed)
+				yield return Tuple.New(anim.Image, pos.ToFloat2() - .5f * anim.Image.size, 0);
 		}
 	}
 }
diff --git a/sequences.xml b/sequences.xml
index cb97504f5f..02ad1a71b3 100644
--- a/sequences.xml
+++ b/sequences.xml
@@ -607,6 +607,6 @@
     <sequence name="idle" start="0" length="32" />
   </unit>
   <unit name="smokey">
-    <sequence name="idle" start="0" length="6" />
+    <sequence name="idle" start="0" length="7" />
   </unit>
 </sequences>
\ No newline at end of file