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

Reverted some of the 'not value' changes, and fixed one boolean check that was not ported correctly

Browse Source
This commit is contained in:
Daniel Ahn 2018-07-21 03:19:08 -07:00
parent 759b8d217a
commit 6f70cff585
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
syncplay/client.py
View File

@ -382,7 +382,7 @@ class SyncplayClient(object):
madeChangeOnPlayer = self._slowDownToCoverTimeDifference(diff, setBy) madeChangeOnPlayer = self._slowDownToCoverTimeDifference(diff, setBy)
if not paused and pauseChanged: if not paused and pauseChanged:
madeChangeOnPlayer = self._serverUnpaused(setBy) madeChangeOnPlayer = self._serverUnpaused(setBy)
elif not paused and pauseChanged: elif paused and pauseChanged:
madeChangeOnPlayer = self._serverPaused(setBy) madeChangeOnPlayer = self._serverPaused(setBy)
return madeChangeOnPlayer return madeChangeOnPlayer
@ -1158,7 +1158,7 @@ class SyncplayUserlist(object):
showOnOSD = constants.SHOW_OSD_WARNINGS showOnOSD = constants.SHOW_OSD_WARNINGS
else: else:
showOnOSD = constants.SHOW_DIFFERENT_ROOM_OSD showOnOSD = constants.SHOW_DIFFERENT_ROOM_OSD
if not constants.SHOW_NONCONTROLLER_OSD and not self.canControl(username): if constants.SHOW_NONCONTROLLER_OSD == False and not self.canControl(username):
showOnOSD = False showOnOSD = False
hideFromOSD = not showOnOSD hideFromOSD = not showOnOSD
if not file_: if not file_:
@ -1275,7 +1275,7 @@ class SyncplayUserlist(object):
return False return False
for user in self._users.values(): for user in self._users.values():
if user.room == self.currentUser.room: if user.room == self.currentUser.room:
if not user.isReadyWithFile(): if not user.isReadyWithFile() == False:
return False return False
elif ( elif (
requireSameFilenames and requireSameFilenames and
@ -1290,7 +1290,7 @@ class SyncplayUserlist(object):
def areAllOtherUsersInRoomReady(self): def areAllOtherUsersInRoomReady(self):
for user in self._users.values(): for user in self._users.values():
if user.room == self.currentUser.room and not user.isReadyWithFile(): if user.room == self.currentUser.room and user.isReadyWithFile() == False:
return False return False
return True return True
@ -1315,7 +1315,7 @@ class SyncplayUserlist(object):
if not self.currentUser.isReady(): if not self.currentUser.isReady():
notReady.append(self.currentUser.username) notReady.append(self.currentUser.username)
for user in self._users.values(): for user in self._users.values():
if user.room == self.currentUser.room and not user.isReadyWithFile(): if user.room == self.currentUser.room and user.isReadyWithFile() == False:
notReady.append(user.username) notReady.append(user.username)
return ", ".join(notReady) return ", ".join(notReady)