From 58fd9ecaffbc21962842244d9160a0a4322987c8 Mon Sep 17 00:00:00 2001
From: RblSb <msrblsb@gmail.com>
Date: Sat, 4 Apr 2020 01:36:39 +0300
Subject: Reconnection state fixes

---
 res/client.js      |  5 ++++-
 src/client/Main.hx | 10 +++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/res/client.js b/res/client.js
index 6519d6c..947541f 100644
--- a/res/client.js
+++ b/res/client.js
@@ -1247,6 +1247,7 @@ client_Main.prototype = {
 		} else {
 			this.guestLogin(name);
 		}
+		this.setLeaderButton((this.personal.group & 2) != 0);
 		this.setPlaylistLock(connected.isPlaylistOpen);
 		this.clearChat();
 		this.serverMessage(1);
@@ -1306,7 +1307,9 @@ client_Main.prototype = {
 			var tag = StringTools.endsWith(emote.image,"mp4") ? "video autoplay=\"\" loop=\"\"" : "img";
 			this.filters.push({ regex : new EReg("(^| )" + this.escapeRegExp(emote.name) + "(?!\\S)","g"), replace : "$1<" + tag + " class=\"channel-emote\" src=\"" + emote.image + "\" title=\"" + emote.name + "\"/>"});
 		}
+		window.document.querySelector("#smilesbtn").classList.remove("active");
 		var smilesWrap = window.document.querySelector("#smileswrap");
+		smilesWrap.style.display = "none";
 		smilesWrap.onclick = function(e) {
 			var el = e.target;
 			var form = window.document.querySelector("#chatline");
@@ -1493,7 +1496,7 @@ client_Main.prototype = {
 	}
 	,setLeaderButton: function(flag) {
 		var leaderBtn = window.document.querySelector("#leader_btn");
-		if((this.personal.group & 2) != 0) {
+		if(flag) {
 			leaderBtn.classList.add("label-success");
 		} else {
 			leaderBtn.classList.remove("label-success");
diff --git a/src/client/Main.hx b/src/client/Main.hx
index 780f005..b1f5e79 100644
--- a/src/client/Main.hx
+++ b/src/client/Main.hx
@@ -449,6 +449,7 @@ class Main {
 		if (hash.length > 0) loginRequest(name, hash);
 		else guestLogin(name);
 
+		setLeaderButton(isLeader());
 		setPlaylistLock(connected.isPlaylistOpen);
 		clearChat();
 		serverMessage(1);
@@ -510,7 +511,9 @@ class Main {
 				replace: '$1<$tag class="channel-emote" src="${emote.image}" title="${emote.name}"/>'
 			});
 		}
+		ge("#smilesbtn").classList.remove("active");
 		final smilesWrap = ge("#smileswrap");
+		smilesWrap.style.display = "none";
 		smilesWrap.onclick = (e:MouseEvent) -> {
 			final el:Element = cast e.target;
 			final form:InputElement = cast ge("#chatline");
@@ -685,11 +688,8 @@ class Main {
 
 	function setLeaderButton(flag:Bool):Void {
 		final leaderBtn = ge("#leader_btn");
-		if (isLeader()) {
-			leaderBtn.classList.add("label-success");
-		} else {
-			leaderBtn.classList.remove("label-success");
-		}
+		if (flag) leaderBtn.classList.add("label-success");
+		else leaderBtn.classList.remove("label-success");
 	}
 
 	function setPlaylistLock(isOpen:Bool):Void {
-- 
cgit v1.2.3