From db9e350404baf5d8439dfc87f2784dd94f5c9b5f Mon Sep 17 00:00:00 2001
From: Mike Thomas <mthomas@threerings.net>
Date: Fri, 27 Aug 2010 00:57:34 +0000
Subject: [PATCH] Ensure we don't leave our sprites in walking-in-place mode
 due to timing issues with resolving all the art.

git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1001 ed5b42cb-e716-0410-a449-f6a68f950b19
---
 src/as/com/threerings/cast/CharacterSprite.as | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/as/com/threerings/cast/CharacterSprite.as b/src/as/com/threerings/cast/CharacterSprite.as
index 39c70be9..9c79d28c 100644
--- a/src/as/com/threerings/cast/CharacterSprite.as
+++ b/src/as/com/threerings/cast/CharacterSprite.as
@@ -234,10 +234,14 @@ public class CharacterSprite extends Sprite
     {
         DisplayUtil.removeAllChildren(_mainSprite);
         if (_aframes != null) {
+            var curFrames :ActionFrames = _aframes;
             _aframes.getFrames(_orient, function(frames :MultiFrameBitmap) :void {
-                _framesBitmap = frames;
-                DisplayUtil.removeAllChildren(_mainSprite);
-                _mainSprite.addChild(frames);
+                // Ensure our action hasn't been swapped out on us since we started loading.
+                if (_aframes == curFrames) {
+                    _framesBitmap = frames;
+                    DisplayUtil.removeAllChildren(_mainSprite);
+                    _mainSprite.addChild(frames);
+                }
             });
         } else {
             _framesBitmap = null;