Fix further problems in syncthingctl after 3f48690

Martchus · Sep 3, 2024 · 6a17b0f · 6a17b0f
1 parent b015b97
commit 6a17b0f
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/cli/application.cpp b/cli/application.cpp
@@ -262,10 +262,13 @@ bool Application::waitForConfig()
 bool Application::waitForConfigAndStatus()
 {
     m_connection.applySettings(m_settings);
-    return waitForSignalsOrFail(bind(&SyncthingConnection::requestConfigAndStatus, ref(m_connection)), m_generalTimeout,
-        signalInfo(&m_connection, &SyncthingConnection::error), signalInfo(&m_connection, &SyncthingConnection::newConfig),
-        signalInfo(&m_connection, &SyncthingConnection::newDirs), signalInfo(&m_connection, &SyncthingConnection::newDevices),
-        signalInfo(&m_connection, &SyncthingConnection::myIdChanged));
+    if (!waitForSignalsOrFail(bind(&SyncthingConnection::requestConfigAndStatus, ref(m_connection)), m_generalTimeout,
+            signalInfo(&m_connection, &SyncthingConnection::error), signalInfo(&m_connection, &SyncthingConnection::newConfig),
+            signalInfo(&m_connection, &SyncthingConnection::myIdChanged))) {
+        return false;
+    }
+    m_connection.applyRawConfig();
+    return true;
 }
 
 void Application::handleStatusChanged(SyncthingStatus newStatus)