X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fnetsplit.cpp;h=d824d9b46cfdc70c5ae765064e2c9f94378a0fa6;hp=89d27a4e277dfc550f2fef3908628cee45cb6a6b;hb=1489728cd358f6bf7151bcdd87b9ea2cbdff7bec;hpb=fd80315c076ede937f5d51ba6f8061a32d0107ec

diff --git a/src/core/netsplit.cpp b/src/core/netsplit.cpp
index 89d27a4e..d824d9b4 100644
--- a/src/core/netsplit.cpp
+++ b/src/core/netsplit.cpp
@@ -23,7 +23,7 @@
 #include <QRegExp>
 
 Netsplit::Netsplit()
-    : _quitMsg("")
+    : _quitMsg(""), _sentQuit(false)
 {
   _discardTimer.setSingleShot(true);
   _joinTimer.setSingleShot(true);
@@ -84,6 +84,10 @@ bool Netsplit::isNetsplit(const QString &quitMessage)
 
 void Netsplit::joinTimeout()
 {
+  if(!_sentQuit) {
+    _quitTimer.stop();
+    quitTimeout();
+  }
   QHash<QString, QStringList>::iterator it;
   for(it = _joins.begin(); it != _joins.end(); ++it)
     emit netsplitJoin(it.key(), it.value(),_quitMsg);
@@ -97,4 +101,5 @@ void Netsplit::quitTimeout()
   QHash<QString, QStringList>::iterator it;
   for(it = _quits.begin(); it != _quits.end(); ++it)
     emit netsplitQuit(it.key(), it.value(),_quitMsg);
+  _sentQuit = true;
 }