Merge b203718c83157bb9be198bc154947f94a217912d into 554bd33f4d030f590a993271f44c90f26907a5ba

This commit is contained in:
3 Python 2016-03-22 23:57:08 +00:00
commit ecc2fcdcc0
2 changed files with 6 additions and 3 deletions

View File

@ -1,4 +1,4 @@
version = '1.3.4'
milestone = 'Chami'
release_number = '21'
projectURL = 'http://syncplay.pl/'
release_number = '22'
projectURL = 'https://github.com/nuthing/syncplay'

View File

@ -406,6 +406,9 @@ class SyncplayClient(object):
filename, size = self.__executePrivacySettings(filename, size)
self.userlist.currentUser.setFile(filename, duration, size, path)
self.sendFile()
self.toggleReady()
self.updatePlayerStatus(True, 0)
self.setPosition(0)
def __executePrivacySettings(self, filename, size):
if self._config['filenamePrivacyMode'] == PRIVACY_SENDHASHED_MODE:
@ -495,7 +498,7 @@ class SyncplayClient(object):
self._lastPlayerUpdate = time.time()
position += self.getUserOffset()
if self._player and self.userlist.currentUser.file:
if position < 0:
if position <= 0:
position = 0
self._protocol.sendState(self.getPlayerPosition(), self.getPlayerPaused(), True, None, True)
self._player.setPosition(position)