From b69ced19cc72a91467989ebbb016e2e33085805b Mon Sep 17 00:00:00 2001
From: Ivo Julca <ivojulca@hotmail.com>
Date: Tue, 16 Dec 2014 12:53:12 -0500
Subject: [PATCH] Revert "Fix battle UI crashing on unexpected requests" It
 causes some unexpected issues on damage reports.

---
 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 2aeed18c6..6336aa66d 100644
--- a/js/client-battle.js
+++ b/js/client-battle.js
@@ -222,7 +222,7 @@
 					}
 				} else {
 					this.controlsShown = true;
-					if (!controlsShown || !this.choice || this.choice.waiting) {
+					if (!controlsShown || (this.choice && this.choice.waiting)) {
 						this.updateControlsForPlayer();
 					}
 				}