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

This commit is contained in:
pokamest 2023-01-31 00:53:24 +00:00
commit ddefb99e5e
20 changed files with 128 additions and 62 deletions

View file

@ -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;