From bcc565dcdd744ca76f00707b2fe7ce6166ed42e8 Mon Sep 17 00:00:00 2001 From: Guangcong Luo Date: Tue, 27 May 2014 03:59:05 -0500 Subject: [PATCH] Fix freeze in 'Skip to Last Turn' button The 'Skip to Last Turn' button would freeze when used on the last turn of a battle. --- js/client-battle.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/client-battle.js b/js/client-battle.js index 58c745568..6fc086b2f 100644 --- a/js/client-battle.js +++ b/js/client-battle.js @@ -619,7 +619,7 @@ this.battle.skipTurn(); }, goToEnd: function() { - while (this.battle.activityQueueActive) this.battle.skipTurn(); + this.battle.fastForwardTo(-1); }, register: function(userid) { var registered = app.user.get('registered');