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

Merge 523dda8e1ddc682dbda7d325e2a727db9ce19412 into aca685ba1823328745d6c2db9b1e6fed067feb6f

Browse Source
This commit is contained in:
Etoh 2012-10-03 19:01:08 -07:00
commit 659a63e971
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
syncplay/client.py
View File

@ -217,6 +217,7 @@ class SyncplayClientManager(object):
if(room == None or room == ''): if(room == None or room == ''):
room = 'default' room = 'default'
self.users.currentUser.room = room self.users.currentUser.room = room
self.defaultRoom = room
if(password): if(password):
password = hashlib.md5(password).hexdigest() password = hashlib.md5(password).hexdigest()
self.serverPassword = password self.serverPassword = password

5
syncplay/ui/consoleUI.py
View File

@ -72,7 +72,10 @@ class ConsoleUI(threading.Thread):
elif matched_room: elif matched_room:
room = matched_room.group(2) room = matched_room.group(2)
if room == None: if room == None:
room = self._syncplayClient.users.currentUser.filename if self._syncplayClient.users.currentUser.filename <> None:
room = self._syncplayClient.users.currentUser.filename
else:
room = self._syncplayClient.defaultRoom
self._syncplayClient.users.currentUser.room = room self._syncplayClient.users.currentUser.room = room
self._syncplayClient.checkIfFileMatchesOthers() self._syncplayClient.checkIfFileMatchesOthers()
self._syncplayClient.protocol.sender.send_room(room) self._syncplayClient.protocol.sender.send_room(room)