From 6bef96673e2a57d3ba7e304d77015b3011cecc60 Mon Sep 17 00:00:00 2001
From: Uriziel <urizieli@gmail.com>
Date: Fri, 25 Apr 2014 22:39:57 +0200
Subject: [PATCH] Fixed rewinds on room switching

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

diff --git a/syncplay/server.py b/syncplay/server.py
index 45ab500..a8d6dbc 100644
--- a/syncplay/server.py
+++ b/syncplay/server.py
@@ -186,9 +186,12 @@ class Room(object):
         return self._name
 
     def getPosition(self):
-        watcher = min(self._watchers.values())
-        self._setBy = watcher
-        return watcher.getPosition()
+        if self._watchers:
+            watcher = min(self._watchers.values())
+            self._setBy = watcher
+            return watcher.getPosition()
+        else:
+            return 0
 
     def setPaused(self, paused=STATE_PAUSED, setBy=None):
         self._playState = paused
@@ -209,6 +212,8 @@ class Room(object):
         return self._watchers.values()
 
     def addWatcher(self, watcher):
+        if self._watchers:
+            watcher.setPosition(self.getPosition())
         self._watchers[watcher.getName()] = watcher
         watcher.setRoom(self)