From 29201b4c539749a0d743fe9ff90d8bdb4b92aa04 Mon Sep 17 00:00:00 2001 From: Giel van Schijndel Date: Tue, 12 May 2009 15:57:03 +0000 Subject: [PATCH] Lobby server: Display the "Removing aborted game" message when removing a game git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7397 4a71c877-e1ca-e34f-864e-861f7616d084 --- tools/masterserver/wzmasterserver.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/masterserver/wzmasterserver.py b/tools/masterserver/wzmasterserver.py index 6ab2663e4..79d0037b7 100755 --- a/tools/masterserver/wzmasterserver.py +++ b/tools/masterserver/wzmasterserver.py @@ -268,7 +268,6 @@ class RequestHandler(SocketServer.ThreadingMixIn, SocketServer.StreamRequestHand hosts = self.g.hosts newGameData = protocol.decodeSingle(self.rfile, self.g) if not newGameData: - logging.debug("(%s) Removing aborted game" % self.gameHost) return self.g.hosts = hosts @@ -321,6 +320,8 @@ class RequestHandler(SocketServer.ThreadingMixIn, SocketServer.StreamRequestHand def finish(self): if self.g: self.g.hosts = filter(lambda s: s != self.gameHost, self.g.hosts) + if not filter(None, self.g.hosts): + logging.debug("(%s) Removing aborted game" % self.gameHost) gamedb.removeGame(self.g) if self.GameId: gamedb.removeGame(self.GameId)