Rezzect/syncplay
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Fix server error when trying to getPosition when position is none

Browse Source
This commit is contained in:
Et0h 2016-02-07 15:38:50 +00:00
parent 1194cce05a
commit e2617088b8
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
syncplay/server.py
View File

@ -256,8 +256,10 @@ class Room(object):
self.__position = watcher.getPosition() self.__position = watcher.getPosition()
self.__lastUpdate = time.time() self.__lastUpdate = time.time()
return self.__position return self.__position
else: elif self.__position is not None:
return self.__position + (age if self._playState == self.STATE_PLAYING else 0) return self.__position + (age if self._playState == self.STATE_PLAYING else 0)
else:
return 0
def setPaused(self, paused=STATE_PAUSED, setBy=None): def setPaused(self, paused=STATE_PAUSED, setBy=None):
self._playState = paused self._playState = paused
@ -326,8 +328,10 @@ class ControlledRoom(Room):
self.__position = watcher.getPosition() self.__position = watcher.getPosition()
self.__lastUpdate = time.time() self.__lastUpdate = time.time()
return self.__position return self.__position
else: elif self.__position is not None:
return self.__position + (age if self._playState == self.STATE_PLAYING else 0) return self.__position + (age if self._playState == self.STATE_PLAYING else 0)
else:
return 0
def addController(self, watcher): def addController(self, watcher):
self._controllers[watcher.getName()] = watcher self._controllers[watcher.getName()] = watcher