Martchus
/
syncthingtray
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix condition to set status to disconnected

This commit is contained in:
Martchus 2018-10-28 15:39:15 +01:00
parent 32b2907e67
commit 25ace0eb17
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
connector/syncthingconnection.cpp
View File

@ -846,7 +846,7 @@ void SyncthingConnection::handleAdditionalRequestCanceled()
if (m_reconnecting) {
// if reconnection flag is set, instantly etstablish a new connection ...
continueReconnecting();
} else if (hasPendingRequests()) {
} else if (!hasPendingRequests()) {
// ... otherwise declare we're disconnected if that was the last pending request
setStatus(SyncthingStatus::Disconnected);
}

1
connector/tests/connectiontests.cpp
View File

@ -592,6 +592,7 @@ void ConnectionTests::testRequestingQrCode()
void ConnectionTests::testDisconnecting()
{
cerr << "\n - Disconnecting ..." << endl;
waitForConnected();
waitForConnection(defaultDisconnect(), 1000, connectionSignal(&SyncthingConnection::statusChanged));
CPPUNIT_ASSERT_EQUAL_MESSAGE("disconnected", QStringLiteral("disconnected"), m_connection.statusText());
}