From: Sebastian Goth <seezer@roath.org>
Date: Mon, 24 Aug 2009 16:01:27 +0000 (+0200)
Subject: Handle very short netsplits
X-Git-Tag: 0.5-rc1~44
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=1489728cd358f6bf7151bcdd87b9ea2cbdff7bec;ds=sidebyside

Handle very short netsplits
---

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;
 }
diff --git a/src/core/netsplit.h b/src/core/netsplit.h
index 135a3f00..d9b2cf22 100644
--- a/src/core/netsplit.h
+++ b/src/core/netsplit.h
@@ -93,7 +93,7 @@ private:
   QString _quitMsg;
   QHash<QString, QStringList> _joins;
   QHash<QString, QStringList> _quits;
-
+  bool _sentQuit;
   QTimer _joinTimer;
   QTimer _quitTimer;
   QTimer _discardTimer;