From c46d22cf09dc52dd073e58064524ef4d30775de0 Mon Sep 17 00:00:00 2001 From: Ivo Julca Date: Tue, 25 Nov 2014 23:05:14 -0500 Subject: [PATCH] Fix crashes from racing conditions in animations --- js/battle.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/js/battle.js b/js/battle.js index 6880934fe..b8d5665fd 100644 --- a/js/battle.js +++ b/js/battle.js @@ -5601,6 +5601,7 @@ var Battle = (function () { this.fastForward = time; this.elem.append('
seeking...
'); $.fx.off = true; + this.elem.find(':animated').finish(); this.swapQueues(); this.nextActivity(); return; @@ -5609,6 +5610,7 @@ var Battle = (function () { this.fastForward = time; this.elem.append('
seeking...
'); $.fx.off = true; + this.elem.find(':animated').finish(); if (this.yourSide.active[0] && this.yourSide.active[0].sprite) { this.yourSide.active[0].sprite.animReset(); }