andrei/amnezia-client
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/amnezia-client.git synced 2026-06-23 02:00:20 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

fixed conflicts

Browse Source
This commit is contained in:
ronoaer
2023-09-09 08:52:16 +08:00
parent 7dc21ce8a7 90d1c16783
commit 3aa0adbf39
3 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/mozilla/localsocketcontroller.cpp
-1
View File
@@ -113,7 +113,6 @@ void LocalSocketController::daemonConnected() {
void LocalSocketController::activate(const QJsonObject &rawConfig) { void LocalSocketController::activate(const QJsonObject &rawConfig) {
qDebug() << rawConfig;
QJsonObject wgConfig = rawConfig.value("wireguard_config_data").toObject(); QJsonObject wgConfig = rawConfig.value("wireguard_config_data").toObject();
QJsonObject json; QJsonObject json;
client/protocols/openvpnovercloakprotocol.cpp
-1
View File
@@ -16,7 +16,6 @@ OpenVpnOverCloakProtocol::OpenVpnOverCloakProtocol(const QJsonObject &configurat
OpenVpnOverCloakProtocol::~OpenVpnOverCloakProtocol() OpenVpnOverCloakProtocol::~OpenVpnOverCloakProtocol()
{ {
qDebug() << "OpenVpnOverCloakProtocol::~OpenVpnOverCloakProtocol";
OpenVpnOverCloakProtocol::stop(); OpenVpnOverCloakProtocol::stop();
m_ckProcess.close(); m_ckProcess.close();
} }
client/protocols/openvpnprotocol.cpp
-1
View File
@@ -19,7 +19,6 @@ OpenVpnProtocol::OpenVpnProtocol(const QJsonObject &configuration, QObject *pare
OpenVpnProtocol::~OpenVpnProtocol() OpenVpnProtocol::~OpenVpnProtocol()
{ {
qDebug() << "OpenVpnProtocol::~OpenVpnProtocol()";
OpenVpnProtocol::stop(); OpenVpnProtocol::stop();
QThread::msleep(200); QThread::msleep(200);
} }