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

Unpause when not ready always set user as ready rather than unpausing

Browse Source
This commit is contained in:
Et0h 2015-02-22 01:02:41 +00:00
parent 0ecf7a585c
commit 76f3bcb9b9
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
syncplay/client.py
View File

@ -166,7 +166,7 @@ class SyncplayClient(object):
self._playerPosition = position self._playerPosition = position
self._playerPaused = paused self._playerPaused = paused
if pauseChange and utils.meetsMinVersion(self.serverVersion, constants.USER_READY_MIN_VERSION): if pauseChange and utils.meetsMinVersion(self.serverVersion, constants.USER_READY_MIN_VERSION):
if not paused and not self.userlist.currentUser.isReady() and not self.userlist.areAllOtherUsersInRoomReady(): if not paused and not self.instaplayConditionsMet():
paused = True paused = True
self._player.setPaused(paused) self._player.setPaused(paused)
self._playerPaused = paused self._playerPaused = paused
@ -517,6 +517,10 @@ class SyncplayClient(object):
else: else:
self.stopAutoplayCountdown() self.stopAutoplayCountdown()
def instaplayConditionsMet(self):
if self.userlist.currentUser.isReady():
return True
def autoplayConditionsMet(self): def autoplayConditionsMet(self):
return self._playerPaused and self.autoPlay and self.userlist.currentUser.canControl() and self.userlist.isReadinessSupported() and self.userlist.areAllUsersInRoomReady() and self.autoPlayThreshold and self.userlist.usersInRoomCount() >= self.autoPlayThreshold return self._playerPaused and self.autoPlay and self.userlist.currentUser.canControl() and self.userlist.isReadinessSupported() and self.userlist.areAllUsersInRoomReady() and self.autoPlayThreshold and self.userlist.usersInRoomCount() >= self.autoPlayThreshold
@ -812,6 +816,7 @@ class SyncplayUserlist(object):
self._roomUsersChanged = True self._roomUsersChanged = True
def isReadinessSupported(self): def isReadinessSupported(self):
# TODO: Return False if server is run with --disable-ready
if not utils.meetsMinVersion(self._client.serverVersion,constants.USER_READY_MIN_VERSION): if not utils.meetsMinVersion(self._client.serverVersion,constants.USER_READY_MIN_VERSION):
return False return False
elif self.onlyUserInRoomWhoSupportsReadiness(): elif self.onlyUserInRoomWhoSupportsReadiness():