Reordering of switchboard timeouts.

git-svn-id: http://delx.cjb.net/svn/pymsnt/trunk@183 55fbd22a-6204-0410-b2f0-b6c764c7e90a

committer: jamesbunton <jamesbunton@55fbd22a-6204-0410-b2f0-b6c764c7e90a>

diff --git a/src/tlib/msn/msnw.py b/src/tlib/msn/msnw.py
index 46d8018d3c059e5eb4a2f37a04f5df12554ae931..d352cbe4491b21727dcf9a247d9bf991d9159cd4 100644 (file)
--- a/src/tlib/msn/msnw.py
+++ b/src/tlib/msn/msnw.py
@@ -690,12 +690,12 @@ class OneSwitchboardSession(SwitchboardSessionBase):
                LogEvent(INFO, self.ident)
                if not self.reply:
                        def failCB(arg=None):
+                               self.timeout = None
+                               self.transport.loseConnection()
                                if not (self.msncon and self.msncon.switchboardSessions.has_key(self.remoteUser)):
                                        return
                                LogEvent(INFO, self.ident, "User has not joined after 30 seconds.")
                                del self.msncon.switchboardSessions[self.remoteUser]
-                               self.timeout = None
-                               self.transport.loseConnection()
                        d = self.inviteUser(self.remoteUser)
                        d.addErrback(failCB)
                        self.timeout = reactor.callLater(30.0, failCB)