From 23159e01e29b894b6229beb32c3545b148febb1a Mon Sep 17 00:00:00 2001 From: Hi Date: Sun, 22 Nov 2020 19:41:56 +0100 Subject: [PATCH] Fixed reconnecting not working. --- irc.py | 3 +-- pesterchum.py | 10 +++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/irc.py b/irc.py index 19bb654..1b01ac5 100644 --- a/irc.py +++ b/irc.py @@ -31,8 +31,7 @@ class PesterIRC(QtCore.QThread): self.ChanServ = services.ChanServ() def IRCConnect(self): port = self.config.port() - server = self.server - self.cli = IRCClient(PesterHandler, host=server, port=int(port), nick=self.mainwindow.profile().handle, real_name='pcc31', blocking=True, timeout=120) + self.cli = IRCClient(PesterHandler, host=self.server, port=int(port), nick=self.mainwindow.profile().handle, real_name='pcc31', blocking=True, timeout=120) self.cli.command_handler.parent = self self.cli.command_handler.mainwindow = self.mainwindow self.cli.connect() diff --git a/pesterchum.py b/pesterchum.py index 1119d4c..562b267 100644 --- a/pesterchum.py +++ b/pesterchum.py @@ -3057,13 +3057,13 @@ class MainProgram(QtCore.QObject): if (reply==QtGui.QMessageBox.YesRole): print("Server is: irc.mindfang.org") - server = "irc.mindfang.org" + self.server = "irc.mindfang.org" if (reply==QtGui.QMessageBox.NoRole): print("Server is: pesterchum.xyz") - server = "pesterchum.xyz" + self.server = "pesterchum.xyz" if (reply==QtGui.QMessageBox.RejectRole): print("Server is: kaliope.ddns.net") - server = "kaliope.ddns.net" + self.server = "kaliope.ddns.net" def doSoundInit(): # TODO: Make this more uniform, adapt it into a general function. @@ -3141,7 +3141,7 @@ class MainProgram(QtCore.QObject): # The way server is passed here now is also not ideal, # but it's at least better than the way it was before. - self.irc = PesterIRC(self.widget.config, self.widget, server) + self.irc = PesterIRC(self.widget.config, self.widget, self.server) self.connectWidgets(self.irc, self.widget) self.connect(self.widget, QtCore.SIGNAL('gainAttention(QWidget*)'), @@ -3374,7 +3374,7 @@ Click this message to never see this again.") else: stop = None if stop is None: - self.irc = PesterIRC(self.widget.config, self.widget, server) + self.irc = PesterIRC(self.widget.config, self.widget, self.server) self.connectWidgets(self.irc, self.widget) self.irc.start() if self.attempts == 1: