projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Already disconnect on Solid::Network::Disconnecting
[quassel.git]
/
src
/
client
/
coreconnection.cpp
diff --git
a/src/client/coreconnection.cpp
b/src/client/coreconnection.cpp
index
3bd59e0
..
8ad692e
100644
(file)
--- 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:
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;
if(state() == Disconnected) {
if(_wantReconnect && s.autoReconnect()) {
reconnectToCore();
}
}
break;
+ case Solid::Networking::Disconnecting:
case Solid::Networking::Unconnected:
case Solid::Networking::Unconnected:
- qDebug() << "Solid: Disconnected";
- if(!isLocalConnection())
+ if(state() != Disconnected && !isLocalConnection())
disconnectFromCore(tr("Network is down"), true);
break;
default:
disconnectFromCore(tr("Network is down"), true);
break;
default:
@@
-255,7
+255,7
@@
void CoreConnection::coreSocketError(QAbstractSocket::SocketError) {
}
void CoreConnection::coreSocketDisconnected() {
}
void CoreConnection::coreSocketDisconnected() {
- qDebug() << Q_FUNC_INFO;
+
//
qDebug() << Q_FUNC_INFO;
resetConnection(true);
// FIXME handle disconnects gracefully
}
resetConnection(true);
// FIXME handle disconnects gracefully
}