From 6a17b0f884ddf41d5c0021574e498b13ad919b91 Mon Sep 17 00:00:00 2001 From: Martchus Date: Tue, 3 Sep 2024 20:25:42 +0200 Subject: [PATCH] Fix further problems in syncthingctl after 3f486900e --- cli/application.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/cli/application.cpp b/cli/application.cpp index a4f3d512..2f6fe3e1 100644 --- 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)