From: Sebastian Goth <seezer@roath.org>
Date: Thu, 10 Dec 2009 12:01:17 +0000 (+0100)
Subject: Cleanup netsplits on disconnect correctly
X-Git-Tag: 0.6-beta1~76
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=863b09125c3bed80b3dfa65eacf587d8bcd3e1e3

Cleanup netsplits on disconnect correctly
---

diff --git a/src/core/ircserverhandler.cpp b/src/core/ircserverhandler.cpp
index 5c3fe827..d51bb0d6 100644
--- a/src/core/ircserverhandler.cpp
+++ b/src/core/ircserverhandler.cpp
@@ -36,11 +36,11 @@ IrcServerHandler::IrcServerHandler(CoreNetwork *parent)
   : BasicHandler(parent),
     _whois(false)
 {
+  connect(parent, SIGNAL(disconnected(NetworkId)), this, SLOT(destroyNetsplits()));
 }
 
 IrcServerHandler::~IrcServerHandler() {
-  if(!_netsplits.empty())
-    qDeleteAll(_netsplits);
+  destroyNetsplits();
 }
 
 /*! Handle a raw message string sent by the server. We try to find a suitable handler, otherwise we call a default handler. */
@@ -1164,6 +1164,11 @@ bool IrcServerHandler::checkParamCount(const QString &methodName, const QList<QB
   }
 }
 
+void IrcServerHandler::destroyNetsplits() {
+  qDebug() << "destroyNetsplits()";
+  qDeleteAll(_netsplits);
+  _netsplits.clear();
+}
 
 /***********************************************************************************/
 
diff --git a/src/core/ircserverhandler.h b/src/core/ircserverhandler.h
index 0d725f6e..4ad28dea 100644
--- a/src/core/ircserverhandler.h
+++ b/src/core/ircserverhandler.h
@@ -107,6 +107,12 @@ private slots:
 
   void handleEarlyNetsplitJoin(const QString &channel, const QStringList &users, const QStringList &modes);
 
+  //! Destroy any existing netsplits
+  /** This slot deletes all netsplit objects
+    * Used to get rid of existing netsplits on network reconnect
+    */
+  void destroyNetsplits();
+
 private:
   void tryNextNick(const QString &errnick, bool erroneus = false);
   bool checkParamCount(const QString &methodName, const QList<QByteArray> &params, int minParams);