From d20a4aea196ae30b5507289f8d2ca763cbb29568 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Feb 2018 18:12:22 +0100
Subject: [PATCH] Avoid nesting in SyncthingConnection::continueConnecting()

---
 connector/syncthingconnection.cpp | 34 ++++++++++++++++---------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/connector/syncthingconnection.cpp b/connector/syncthingconnection.cpp
index 7335cea..7efb473 100644
--- a/connector/syncthingconnection.cpp
+++ b/connector/syncthingconnection.cpp
@@ -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();
 }
 
 /*!