From 3bfb278d1df195646484a56d4b0770c4521f18f5 Mon Sep 17 00:00:00 2001
From: Uriziel <urizieli@gmail.com>
Date: Fri, 19 Oct 2012 15:50:49 +0200
Subject: [PATCH] Fixed switching rooms in server

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

diff --git a/syncplay/server.py b/syncplay/server.py
index bba0858..cbed09c 100644
--- a/syncplay/server.py
+++ b/syncplay/server.py
@@ -66,7 +66,8 @@ class SyncFactory(Factory):
     def _removeWatcherFromTheRoom(self, watcherProtocol):
         for room in self._rooms.itervalues():
             watcher = room.pop(watcherProtocol, None)
-            return watcher
+            if(watcher):
+                return watcher
 
     def _deleteRoomIfEmpty(self, room):
         if (self._rooms[room] == {}):
@@ -227,7 +228,8 @@ class Watcher(object):
     
     def resetStateTimer(self):
         if(self._sendStateTimer):
-            self._sendStateTimer.reset()
+            self._sendStateTimer.stop()
+            self._sendStateTimer.start(1)
             
     def deactivate(self):
         if(self._sendStateTimer):