Merge pull request #530 from amnezia-vpn/bugfix/admin-user-clinet-management

fixed adding admin user to client management
This commit is contained in:
pokamest
2024-01-25 01:58:39 -08:00
committed by GitHub
+7 -4
View File
@@ -253,10 +253,13 @@ QString VpnConnection::createVpnConfigurationForProto(int serverIndex, const Ser
m_settings->setProtocolConfig(serverIndex, container, proto, protoObject); m_settings->setProtocolConfig(serverIndex, container, proto, protoObject);
} }
QEventLoop wait; if ((container != DockerContainer::Cloak && container != DockerContainer::ShadowSocks) ||
emit m_configurator->newVpnConfigCreated(clientId, QString("Admin [%1]").arg(QSysInfo::prettyProductName()), container, credentials); ((container == DockerContainer::Cloak || container == DockerContainer::ShadowSocks) && proto == Proto::OpenVpn)) {
QObject::connect(m_configurator.get(), &VpnConfigurator::clientModelUpdated, &wait, &QEventLoop::quit); QEventLoop wait;
wait.exec(); 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; return configData;