--- a/Network/IRC/IrcWidget.py Sun Aug 07 15:56:15 2016 +0200 +++ b/Network/IRC/IrcWidget.py Wed Aug 10 16:23:08 2016 +0200 @@ -246,10 +246,20 @@ """ closed.</p>""") .format(self.__server.getName())) if ok: - self.networkWidget.addServerMessage( - self.tr("Info"), - self.tr("Disconnecting from server {0}...").format( - self.__server.getName())) + if self.__server is not None: + self.networkWidget.addServerMessage( + self.tr("Info"), + self.tr("Disconnecting from server {0}...").format( + self.__server.getName())) + elif name: + self.networkWidget.addServerMessage( + self.tr("Info"), + self.tr("Disconnecting from network {0}...").format( + name)) + else: + self.networkWidget.addServerMessage( + self.tr("Info"), + self.tr("Disconnecting from server.")) self.__closeAllChannels() self.__send("QUIT :" + self.__quitMessage) self.__socket and self.__socket.flush()