Merge pull request #311 from amnezia-vpn/bugfix/crash_on_exit_fix

Crash on exit fix
amnezia-vpn · Sep 2, 2023 · 2eb729d · 2eb729d
2 parents a2893ba + 0343b6c
commit 2eb729d
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 15 deletions.
diff --git a/client/protocols/openvpnovercloakprotocol.cpp b/client/protocols/openvpnovercloakprotocol.cpp
@@ -16,7 +16,6 @@ OpenVpnOverCloakProtocol::OpenVpnOverCloakProtocol(const QJsonObject &configurat
 
 OpenVpnOverCloakProtocol::~OpenVpnOverCloakProtocol()
 {
-    qDebug() << "OpenVpnOverCloakProtocol::~OpenVpnOverCloakProtocol";
     OpenVpnOverCloakProtocol::stop();
     m_ckProcess.close();
 }

diff --git a/client/protocols/openvpnprotocol.cpp b/client/protocols/openvpnprotocol.cpp
@@ -20,7 +20,6 @@ OpenVpnProtocol::OpenVpnProtocol(const QJsonObject &configuration, QObject* pare
 
 OpenVpnProtocol::~OpenVpnProtocol()
 {
-    qDebug() << "OpenVpnProtocol::~OpenVpnProtocol()";
     OpenVpnProtocol::stop();
     QThread::msleep(200);
 }

diff --git a/client/ui/uilogic.cpp b/client/ui/uilogic.cpp
@@ -107,19 +107,6 @@ UiLogic::~UiLogic()
 {
     emit hide();
 
-#ifdef AMNEZIA_DESKTOP
-    if (m_vpnConnection->connectionState() != VpnProtocol::VpnConnectionState::Disconnected) {
-        m_vpnConnection->disconnectFromVpn();
-        for (int i = 0; i < 50; i++) {
-            qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
-            QThread::msleep(100);
-            if (m_vpnConnection->isDisconnected()) {
-                break;
-            }
-        }
-    }
-#endif
-
     m_vpnConnection->deleteLater();
     m_vpnConnectionThread.quit();
     m_vpnConnectionThread.wait(3000);