From 72c00331d51da0d48a6f4a93e705430bd3c8a456 Mon Sep 17 00:00:00 2001
From: Uriziel <urizieli@gmail.com>
Date: Mon, 21 Apr 2014 18:13:06 +0200
Subject: [PATCH] Fixed room switching dropping clients

---
 syncplay/server.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/syncplay/server.py b/syncplay/server.py
index 6133b7d..7f21d40 100644
--- a/syncplay/server.py
+++ b/syncplay/server.py
@@ -275,11 +275,12 @@ class Watcher(object):
 
     def _resetStateTimer(self):
         if self._sendStateTimer:
-            self._sendStateTimer.stop()
+            if self._sendStateTimer.running:
+                self._sendStateTimer.stop()
             self._sendStateTimer.start(constants.SERVER_STATE_INTERVAL)
 
     def _deactivateStateTimer(self):
-        if(self._sendStateTimer):
+        if(self._sendStateTimer and self._sendStateTimer.running):
             self._sendStateTimer.stop()
 
     def sendState(self, position, paused, doSeek, setBy, forcedUpdate):