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

Avoid nesting in SyncthingConnection::continueConnecting()

This commit is contained in:
Martchus 2018-02-18 18:12:22 +01:00
parent 11bf8812e0
commit d20a4aea19
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
connector/syncthingconnection.cpp
View File

@ -678,23 +678,25 @@ SyncthingDev *SyncthingConnection::addDevInfo(std::vector<SyncthingDev> &devs, c
*/
void SyncthingConnection::continueConnecting()
{
if (m_keepPolling && m_hasConfig && m_hasStatus) {
requestConnections();
requestDirStatistics();
requestDeviceStatistics();
requestErrors();
for (const SyncthingDir &dir : m_dirs) {
requestDirStatus(dir.id);
if (m_requestCompletion) {
for (const QString &devId : dir.deviceIds) {
requestCompletion(devId, dir.id);
}
}
}
// since config and status could be read successfully, let's poll for events
m_lastEventId = 0;
requestEvents();
if (!m_keepPolling || !m_hasConfig || !m_hasStatus) {
return;
}
requestConnections();
requestDirStatistics();
requestDeviceStatistics();
requestErrors();
for (const SyncthingDir &dir : m_dirs) {
requestDirStatus(dir.id);
if (!m_requestCompletion) {
continue;
}
for (const QString &devId : dir.deviceIds) {
requestCompletion(devId, dir.id);
}
}
// since config and status could be read successfully, let's poll for events
m_lastEventId = 0;
requestEvents();
}
/*!