From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Tue, 9 Mar 2010 18:36:27 +0000 (+0100)
Subject: Already disconnect on Solid::Network::Disconnecting
X-Git-Tag: 0.6.0~33
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=d30e35dfabe35d7477c8a1c55b229447c5062f28

Already disconnect on Solid::Network::Disconnecting

Not sure if this state is ever reached (as most solid disconnections occur after
the network is already down), but if it does, it gives us a chance to cleanly
take down the sockets etc. before being offline.
---

diff --git a/src/client/coreconnection.cpp b/src/client/coreconnection.cpp
index 3bd59e0b..8ad692e2 100644
--- a/src/client/coreconnection.cpp
+++ b/src/client/coreconnection.cpp
@@ -153,16 +153,16 @@ void CoreConnection::solidNetworkStatusChanged(Solid::Networking::Status status)
   switch(status) {
   case Solid::Networking::Unknown:
   case Solid::Networking::Connected:
-    qDebug() << "Solid: Network status changed to connected or unknown";
+    //qDebug() << "Solid: Network status changed to connected or unknown";
     if(state() == Disconnected) {
       if(_wantReconnect && s.autoReconnect()) {
         reconnectToCore();
       }
     }
     break;
+  case Solid::Networking::Disconnecting:
   case Solid::Networking::Unconnected:
-    qDebug() << "Solid: Disconnected";
-    if(!isLocalConnection())
+    if(state() != Disconnected && !isLocalConnection())
       disconnectFromCore(tr("Network is down"), true);
     break;
   default:
@@ -255,7 +255,7 @@ void CoreConnection::coreSocketError(QAbstractSocket::SocketError) {
 }
 
 void CoreConnection::coreSocketDisconnected() {
-  qDebug() << Q_FUNC_INFO;
+  // qDebug() << Q_FUNC_INFO;
   resetConnection(true);
   // FIXME handle disconnects gracefully
 }