Merge pull request #473 from amnezia-vpn/bugfix/new-client-on-connection
fixed hang after creating configuration on connection
This commit is contained in:
commit
f1a0b7f0ef
6 changed files with 21 additions and 7 deletions
|
|
@ -4,6 +4,7 @@
|
|||
#include <QFile>
|
||||
#include <QHostInfo>
|
||||
#include <QJsonObject>
|
||||
#include <QEventLoop>
|
||||
|
||||
#include <configurators/cloak_configurator.h>
|
||||
#include <configurators/openvpn_configurator.h>
|
||||
|
|
@ -250,7 +251,10 @@ QString VpnConnection::createVpnConfigurationForProto(int serverIndex, const Ser
|
|||
m_settings->setProtocolConfig(serverIndex, container, proto, protoObject);
|
||||
}
|
||||
|
||||
emit m_configurator->newVpnConfigCreated(clientId, "unnamed client", container, credentials);
|
||||
QEventLoop wait;
|
||||
emit m_configurator->newVpnConfigCreated(clientId, QString("Admin [%1]").arg(QSysInfo::prettyProductName()), container, credentials);
|
||||
QObject::connect(m_configurator.get(), &VpnConfigurator::clientModelUpdated, &wait, &QEventLoop::quit);
|
||||
wait.exec();
|
||||
}
|
||||
|
||||
return configData;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue