AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed conflicts

Browse source
This commit is contained in:
ronoaer 2023-09-09 08:52:16 +08:00
commit 3aa0adbf39
3 changed files with 0 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
client/mozilla/localsocketcontroller.cpp
View file

@ -113,7 +113,6 @@ void LocalSocketController::daemonConnected() {
void LocalSocketController::activate(const QJsonObject &rawConfig) {
qDebug() << rawConfig;
QJsonObject wgConfig = rawConfig.value("wireguard_config_data").toObject();
QJsonObject json;

1
client/protocols/openvpnovercloakprotocol.cpp
View file

@ -16,7 +16,6 @@ OpenVpnOverCloakProtocol::OpenVpnOverCloakProtocol(const QJsonObject &configurat
OpenVpnOverCloakProtocol::~OpenVpnOverCloakProtocol()
{
qDebug() << "OpenVpnOverCloakProtocol::~OpenVpnOverCloakProtocol";
OpenVpnOverCloakProtocol::stop();
m_ckProcess.close();
}

1
client/protocols/openvpnprotocol.cpp
View file

@ -19,7 +19,6 @@ OpenVpnProtocol::OpenVpnProtocol(const QJsonObject &configuration, QObject *pare
OpenVpnProtocol::~OpenVpnProtocol()
{
qDebug() << "OpenVpnProtocol::~OpenVpnProtocol()";
OpenVpnProtocol::stop();
QThread::msleep(200);
}