From b6f03a42b40dd53e904186172dbb805727eb34ef Mon Sep 17 00:00:00 2001 From: Jeremy Fincher Date: Tue, 17 Aug 2004 15:20:59 +0000 Subject: [PATCH] We shouldn't send a new nick in response to 433 when we've already connected. --- src/irclib.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/irclib.py b/src/irclib.py index ddc6a47b4..07c665721 100644 --- a/src/irclib.py +++ b/src/irclib.py @@ -611,10 +611,11 @@ class Irc(IrcCommandDispatcher): def do433(self, msg): """Handles 'nickname already in use' messages.""" - newNick = self._getNextNick() - assert newNick != self.nick, 'self._getNextNick() returned same nick.' - log.info('Got 433: %s is in use. Trying %s.', self.nick, newNick) - self.sendMsg(ircmsgs.nick(newNick)) + if not self.afterConnect: + newNick = self._getNextNick() + assert newNick != self.nick + log.info('Got 433: %s is in use. Trying %s.', self.nick, newNick) + self.sendMsg(ircmsgs.nick(newNick)) do432 = do433 # 432: Erroneous nickname. def doJoin(self, msg):