Stop current animation if current animation asset is removed from the…

… assets array
playcanvas · May 11, 2015 · 35a4ed3 · 35a4ed3
1 parent d201c6a
commit 35a4ed3
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/src/framework/components/animation/animation_component.js b/src/framework/components/animation/animation_component.js
@@ -174,17 +174,20 @@ pc.extend(pc, function () {
             if (this.animations && this.animations[asset.name]) {
                 delete this.animations[asset.name];
                 if (this.data.currAnim === asset.name) {
-                    this.data.currAnim = null;
-                    this.speed = 0;
-                    this.data.playing = false;
-                    if (this.data.skeleton) {
-                        this.data.skeleton.setCurrentTime(0);
-                        this.data.skeleton.setAnimation(null);
-                    }
+                    this._stopCurrentAnimation();
                 }
             }
         },
 
+        _stopCurrentAnimation: function () {
+            this.data.currAnim = null;
+            this.data.playing = false;
+            if (this.data.skeleton) {
+                this.data.skeleton.setCurrentTime(0);
+                this.data.skeleton.setAnimation(null);
+            }
+        },
+
         onSetAnimations: function (name, oldValue, newValue) {
             var data = this.data;
 
@@ -215,6 +218,10 @@ pc.extend(pc, function () {
                         if (asset) {
                             asset.off('change', this.onAssetChanged, this);
                             asset.off('remove', this.onAssetRemoved, this);
+
+                            if (this.data.currAnim === asset.name) {
+                                this._stopCurrentAnimation();
+                            }
                         }
                     }
                 }