X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fnetworkconnection.cpp;fp=src%2Fcore%2Fnetworkconnection.cpp;h=3d9fcc73c18dff8defef76c5130b7999c3195384;hp=530ee32ba9c82b66594fc7e79b4f6a5399ae071f;hb=72d23cc04e32bfc166720f9b7ecaf4f53e63ec5e;hpb=a9ed3d0f695c6114ce643946452be686883ba2c7

diff --git a/src/core/networkconnection.cpp b/src/core/networkconnection.cpp
index 530ee32b..3d9fcc73 100644
--- a/src/core/networkconnection.cpp
+++ b/src/core/networkconnection.cpp
@@ -45,6 +45,7 @@ NetworkConnection::NetworkConnection(Network *network, CoreSession *session)
     _userInputHandler(new UserInputHandler(this)),
     _ctcpHandler(new CtcpHandler(this)),
     _autoReconnectCount(0),
+    _quitRequested(false),
 
     _previousConnectionAttemptFailed(false),
     _lastUsedServerlistIndex(0),
@@ -54,7 +55,7 @@ NetworkConnection::NetworkConnection(Network *network, CoreSession *session)
     _autoWhoInterval(90),
     _autoWhoNickLimit(0), // unlimited
     _autoWhoDelay(3),
-    
+
     // TokenBucket to avaid sending too much at once
     _messagesPerSecond(1),
     _burstSize(5),
@@ -66,14 +67,13 @@ NetworkConnection::NetworkConnection(Network *network, CoreSession *session)
     _maxMsgSize(450)
 {
   _autoReconnectTimer.setSingleShot(true);
-
+  _socketCloseTimer.setSingleShot(true);
+  connect(&_socketCloseTimer, SIGNAL(timeout()), this, SLOT(socketCloseTimeout()));
+  
   _autoWhoTimer.setInterval(_autoWhoDelay * 1000);
-  _autoWhoTimer.setSingleShot(false);
   _autoWhoCycleTimer.setInterval(_autoWhoInterval * 1000);
-  _autoWhoCycleTimer.setSingleShot(false);
-
+  
   _tokenBucketTimer.start(_messagesPerSecond * 1000);
-  _tokenBucketTimer.setSingleShot(false);
 
   QHash<QString, QString> channels = coreSession()->persistentChannels(networkId());
   foreach(QString chan, channels.keys()) {
@@ -260,12 +260,13 @@ void NetworkConnection::disconnectFromIrc(bool requested) {
     setConnectionState(Network::Disconnected);
     socketDisconnected();
   } else {
-    socket.disconnectFromHost();
+    _socketCloseTimer.start(10000); // the irc server has 10 seconds to close the socket
   }
 
-  if(requested) {
-    emit quitRequested(networkId());
-  }
+  // this flag triggers quitRequested() once the socket is closed
+  // it is needed to determine whether or not the connection needs to be
+  // in the automatic session restore.
+  _quitRequested = requested;
 }
 
 void NetworkConnection::socketHasData() {
@@ -369,18 +370,26 @@ void NetworkConnection::socketStateChanged(QAbstractSocket::SocketState socketSt
   setConnectionState(state);
 }
 
+void NetworkConnection::socketCloseTimeout() {
+  socket.disconnectFromHost();
+}
+
 void NetworkConnection::socketDisconnected() {
   _autoWhoCycleTimer.stop();
   _autoWhoTimer.stop();
   _autoWhoQueue.clear();
   _autoWhoInProgress.clear();
 
+  _socketCloseTimer.stop();
+  
   network()->setConnected(false);
   emit disconnected(networkId());
   if(_autoReconnectCount != 0) {
     setConnectionState(Network::Reconnecting);
     if(_autoReconnectCount == network()->autoReconnectRetries()) doAutoReconnect(); // first try is immediate
     else _autoReconnectTimer.start();
+  } else if(_quitRequested) {
+    emit quitRequested(networkId());
   }
 }