From b317fba28af94d433ebd64a2c30a905e8f0e9d10 Mon Sep 17 00:00:00 2001
From: sD <stoned@derpymail.org>
Date: Thu, 19 Dec 2019 02:03:02 +0100
Subject: fix #27

---
 webAO/client.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'webAO/client.js')

diff --git a/webAO/client.js b/webAO/client.js
index ec12c13..9cf59fb 100644
--- a/webAO/client.js
+++ b/webAO/client.js
@@ -879,6 +879,7 @@ class Client extends EventEmitter {
 		document.getElementById("client_inputbox").style.display = "";
 
 		const me = this.character;
+		this.selectedEmote = -1;
 		const emotes = this.emotes;
 		const emotesList = document.getElementById("client_emo");
 		emotesList.innerHTML = ""; // Clear emote box
@@ -1740,8 +1741,12 @@ window.pickChar = pickChar;
  * @param {string} emo the new emotion to be selected
  */
 export function pickEmotion(emo) {
-	if (client.selectedEmote !== -1) {
-		document.getElementById("emo_" + client.selectedEmote).src = client.emote.button_off;
+	try {
+		if (client.selectedEmote !== -1) {
+			document.getElementById("emo_" + client.selectedEmote).src = client.emote.button_off;
+		}
+	} catch (err) {
+		// do nothing
 	}
 	client.selectedEmote = emo;
 	document.getElementById("emo_" + emo).src = client.emote.button_on;
-- 
cgit