added disconnection from vpn when closing application for desktop

- many small ui fixes
2023-08-16 12:11:34 +05:00 · 2023-08-16 12:11:34 +05:00 · e157160337
commit e157160337
parent 14fa0b4fd3
24 changed files with 121 additions and 64 deletions
--- a/client/ui/controllers/connectionController.cpp
+++ b/client/ui/controllers/connectionController.cpp
@ -17,6 +17,23 @@ ConnectionController::ConnectionController(const QSharedPointer<ServersModel> &s
            Qt::QueuedConnection);
 }

+ConnectionController::~ConnectionController()
+{
+// todo use ConnectionController instead of using m_vpnConnection directly
+#ifdef AMNEZIA_DESKTOP
+    if (m_vpnConnection->connectionState() != Vpn::ConnectionState::Disconnected) {
+        m_vpnConnection->disconnectFromVpn();
+        for (int i = 0; i < 50; i++) {
+            qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
+            QThread::msleep(100);
+            if (m_vpnConnection->isDisconnected()) {
+                break;
+            }
+        }
+    }
+#endif
+}
+
 void ConnectionController::openConnection()
 {
    int serverIndex = m_serversModel->getDefaultServerIndex();