From e2617088b8599a760e7a17f079c777b2a816a9e4 Mon Sep 17 00:00:00 2001 From: Et0h Date: Sun, 7 Feb 2016 15:38:50 +0000 Subject: [PATCH] Fix server error when trying to getPosition when position is none --- syncplay/server.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/syncplay/server.py b/syncplay/server.py index cb26dc8..73ccd38 100644 --- a/syncplay/server.py +++ b/syncplay/server.py @@ -256,8 +256,10 @@ class Room(object): self.__position = watcher.getPosition() self.__lastUpdate = time.time() return self.__position - else: + elif self.__position is not None: return self.__position + (age if self._playState == self.STATE_PLAYING else 0) + else: + return 0 def setPaused(self, paused=STATE_PAUSED, setBy=None): self._playState = paused @@ -326,8 +328,10 @@ class ControlledRoom(Room): self.__position = watcher.getPosition() self.__lastUpdate = time.time() return self.__position - else: + elif self.__position is not None: return self.__position + (age if self._playState == self.STATE_PLAYING else 0) + else: + return 0 def addController(self, watcher): self._controllers[watcher.getName()] = watcher