From 549b16cb2a2420232fbacec5e259f8bd79786b58 Mon Sep 17 00:00:00 2001 From: Uriziel Date: Tue, 18 Sep 2012 13:19:33 +0200 Subject: [PATCH] Fix on room changing --- syncplay/server.py | 6 ++---- syncplay/ui/consoleUI.py | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/syncplay/server.py b/syncplay/server.py index 52705e7..fe01264 100644 --- a/syncplay/server.py +++ b/syncplay/server.py @@ -127,15 +127,14 @@ class SyncServerProtocol(CommandProtocol): @state('connected') @argumentCount(1) def room(self, args): - watcher = self.factory.watchers.get(self) + watcher = self.factory.watchers.get(self._protocol) old_room = watcher.room watcher.room = str(re.sub('[^\w]','',args[0])) self.factory.broadcast(watcher, lambda receiver: receiver.watcher_proto.send_room(watcher.name,watcher.room)) if not watcher.room in self.factory.paused: self.factory.paused[watcher.room] = True self.factory.remove_room_if_empty(old_room) - watcher = self.factory.watchers.get(self.__protocol) - + @state('connected') @argumentCount(0) def list(self, args): @@ -446,5 +445,4 @@ class SyncFactory(Factory): if(self.isolate_rooms): self.broadcast_room(sender, what) for receiver in self.watchers.itervalues(): - #if receiver != sender: what(receiver) diff --git a/syncplay/ui/consoleUI.py b/syncplay/ui/consoleUI.py index b93bbe7..049044a 100644 --- a/syncplay/ui/consoleUI.py +++ b/syncplay/ui/consoleUI.py @@ -74,7 +74,7 @@ class ConsoleUI(threading.Thread): room = 'default' self._syncplayClient.users.currentUser.room = room self._syncplayClient.checkIfFileMatchesOthers() - #self._syncplayClient.protocol.sender.send_room(room) + self._syncplayClient.protocol.sender.send_room(room) elif data == "r": tmp_pos = self._syncplayClient.player_position self._syncplayClient.player.set_position(self._syncplayClient.player_position_before_last_seek)