From a636fd4176df336ae1a26eb7ef96a1180dc7475c Mon Sep 17 00:00:00 2001 From: Uriziel Date: Mon, 17 Sep 2012 22:12:54 +0200 Subject: [PATCH] das --- syncplay/server.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/syncplay/server.py b/syncplay/server.py index b3565dd..87a5f8a 100644 --- a/syncplay/server.py +++ b/syncplay/server.py @@ -105,7 +105,7 @@ class SyncServerProtocol(CommandProtocol): @state('connected') @argumentCount(1) def playing(self, args): - self.factory.playing_received(self, args[0]) + self.factory.playing_received(self.__protocol, args[0]) @state('connected') @@ -118,12 +118,12 @@ class SyncServerProtocol(CommandProtocol): 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) + watcher = self.factory.watchers.get(self.__protocol) @state('connected') @argumentCount(0) def list(self, args): - watcher = self.factory.watchers.get(self) + watcher = self.factory.watchers.get(self.__protocol) for w in self.factory.watchers.itervalues(): if w == watcher: continue