diff --git a/client/core/servercontroller.cpp b/client/core/servercontroller.cpp index 716a7740..375215b7 100644 --- a/client/core/servercontroller.cpp +++ b/client/core/servercontroller.cpp @@ -549,10 +549,9 @@ ErrorCode ServerController::installDockerWorker(const ServerCredentials &credent return ErrorCode::NoError; }); - watcher.setFuture(future); - QEventLoop wait; QObject::connect(&watcher, &QFutureWatcher::finished, &wait, &QEventLoop::quit); + watcher.setFuture(future); wait.exec(); m_cancelInstallation = false; diff --git a/client/protocols/wireguardprotocol.cpp b/client/protocols/wireguardprotocol.cpp index 985d835c..224d5176 100644 --- a/client/protocols/wireguardprotocol.cpp +++ b/client/protocols/wireguardprotocol.cpp @@ -12,7 +12,7 @@ WireguardProtocol::WireguardProtocol(const QJsonObject &configuration, QObject* VpnProtocol(configuration, parent) { m_configFile.setFileName(QDir::tempPath() + QDir::separator() + serviceName() + ".conf"); - readWireguardConfiguration(configuration); + writeWireguardConfiguration(configuration); } WireguardProtocol::~WireguardProtocol() @@ -70,7 +70,7 @@ void WireguardProtocol::stop() } -void WireguardProtocol::readWireguardConfiguration(const QJsonObject &configuration) +void WireguardProtocol::writeWireguardConfiguration(const QJsonObject &configuration) { QJsonObject jConfig = configuration.value(ProtocolProps::key_proto_config_data(Proto::WireGuard)).toObject(); diff --git a/client/protocols/wireguardprotocol.h b/client/protocols/wireguardprotocol.h index 3a091cac..7a50b0d3 100644 --- a/client/protocols/wireguardprotocol.h +++ b/client/protocols/wireguardprotocol.h @@ -23,7 +23,7 @@ public: private: QString configPath() const; - void readWireguardConfiguration(const QJsonObject &configuration); + void writeWireguardConfiguration(const QJsonObject &configuration); void updateRouteGateway(QString line); void updateVpnGateway(const QString &line);