From b216f9271b07b1171a2be36a6cb72989347a873d Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Mon, 9 Feb 2015 19:11:35 +0000
Subject: [PATCH] should be final logic for chatandusers

---
 src/static/js/chat.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/static/js/chat.js b/src/static/js/chat.js
index 7fd687ea..811b1320 100644
--- a/src/static/js/chat.js
+++ b/src/static/js/chat.js
@@ -22,6 +22,7 @@ var hooks = require('./pluginfw/hooks');
 var chat = (function()
 {
   var isStuck = false;
+  var userAndChat = false;
   var gotInitialMessages = false;
   var historyPointer = 0;
   var chatMentions = 0;
@@ -57,14 +58,16 @@ var chat = (function()
     chatAndUsers: function(fromInitialCall)
     {
       var toEnable = $('#options-chatandusers').is(":checked");
-      if(toEnable || fromInitialCall){
+      if(toEnable || !userAndChat || fromInitialCall){
         padcookie.setPref("chatAndUsers", true);
         chat.stickToScreen(true);
         $('#options-stickychat').prop('checked', true)
+        $('#options-chatandusers').prop('checked', true)
         $('#options-stickychat').prop("disabled", "disabled");
         $('#users').addClass("chatAndUsers");
         $("#chatbox").addClass("chatAndUsersChat");
         // redraw
+        userAndChat = true;
         padeditbar.redrawHeight()
       }else{
         padcookie.setPref("chatAndUsers", false);