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

Fixed notices about your room switches/file switches

Browse Source
This commit is contained in:
Uriziel 2013-06-11 23:40:10 +02:00
parent ab16e8b664
commit 207d2bf1ae
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
syncplay/client.py
View File

@ -304,9 +304,6 @@ class SyncplayClient(object):
def setRoom(self, roomName):
self.userlist.currentUser.room = roomName
self.getUserList()
if(self._protocol):
message = getMessage("en", "room-join-notification").format(self.getUsername(), roomName)
self.ui.showMessage(message)
def sendRoom(self):
room = self.userlist.currentUser.room
@ -490,9 +487,7 @@ class SyncplayUserlist(object):
self._roomUsersChanged = True
def __showUserChangeMessage(self, username, room, file_):
if(username == self.currentUser.username):
pass
elif(room and not file_):
if(room and not file_):
message = getMessage("en", "room-join-notification").format(username, room)
self.ui.showMessage(message)
elif (room and file_):

2
syncplay/server.py
View File

@ -255,7 +255,7 @@ class SyncFactory(Factory):
self._roomStates[room]["lastUpdate"] = time.time()
self._deleteRoomIfEmpty(oldRoom)
watcher.room = room
l = lambda w: w.sendUserSetting(watcher.name, watcher.room, watcher.file, None)
l = lambda w: w.sendUserSetting(watcher.name, watcher.room, None, None)
self.broadcast(watcherProtocol, l)
def watcherSetFile(self, watcherProtocol, file_):