Merge branch 'dev' into feature/qt6-libssh-support

2026-06-21 02:01:03 +07:00 · 2023-01-31 00:53:24 +00:00
parent 74fbce8b96 ca4d6e0b2f
commit ddefb99e5e
20 changed files with 128 additions and 62 deletions
@@ -396,10 +396,9 @@ ErrorCode ServerController::installDockerWorker(const ServerCredentials &credent
        return ErrorCode::NoError;
    });

-    watcher.setFuture(future);
-
    QEventLoop wait;
    QObject::connect(&watcher, &QFutureWatcher<ErrorCode>::finished, &wait, &QEventLoop::quit);
+    watcher.setFuture(future);
    wait.exec();

    m_cancelInstallation = false;