From 22e8e10680d549e6b4cbd8ecda169a087dcc78a7 Mon Sep 17 00:00:00 2001
From: calzoneman <calzoneman@gmail.com>
Date: Thu, 14 Nov 2013 22:23:33 -0600
Subject: [PATCH] Fix being kicked when removing leader

---
 changelog                  | 3 +++
 www/assets/js/callbacks.js | 7 ++++++-
 www/assets/js/util.js      | 3 +++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/changelog b/changelog
index 90a4eaa0..a9c3feb8 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,6 @@
+Thu Nov 14 22:22 2013 CDT
+    * www/assets/js/callbacks.js: Fix being kicked when leader is removed
+
 Thu Nov 14 19:49 2013 CDT
     * www/assets/js/callbacks.js: Fix AFK users on join and profile
       updates.
diff --git a/www/assets/js/callbacks.js b/www/assets/js/callbacks.js
index f3d62720..2393ee9a 100644
--- a/www/assets/js/callbacks.js
+++ b/www/assets/js/callbacks.js
@@ -705,8 +705,13 @@ Callbacks = {
                 addUserDropdown($(this));
             }
         });
-        if (name === "")
+        if (name === "") {
+            CLIENT.leader = false;
+            if(LEADTMR)
+                clearInterval(LEADTMR);
+            LEADTMR = false;
             return;
+        }
         var user = findUserlistItem(name);
         if (user) {
             user.data("leader", true);
diff --git a/www/assets/js/util.js b/www/assets/js/util.js
index 7860dee8..78c42bf7 100644
--- a/www/assets/js/util.js
+++ b/www/assets/js/util.js
@@ -1426,6 +1426,9 @@ function parseMediaLink(url) {
 }
 
 function sendVideoUpdate() {
+    if (!CLIENT.leader) {
+        return;
+    }
     PLAYER.getTime(function (seconds) {
         socket.emit("mediaUpdate", {
             id: PLAYER.videoId,