some changes

client/amnezia_application.cpp

@@ -60,9 +60,9 @@ AmneziaApplication::~AmneziaApplication()
 
     m_vpnConnectionThread.quit();
 
-    if (!m_vpnConnectionThread.wait(5000)) {
+    if (!m_vpnConnectionThread.wait(4000)) {
         m_vpnConnectionThread.terminate();
-        m_vpnConnectionThread.wait();
+        m_vpnConnectionThread.wait(1000);
     }
 
     if (m_engine) {

client/ui/controllers/pageController.cpp

@@ -136,6 +136,12 @@ void PageController::setTriggeredByConnectButton(bool trigger)
 
 void PageController::closeApplication()
 {
+#if defined(Q_OS_LINUX)
+    for (auto w : qApp->topLevelWidgets()) {
+        w->close();
+    }
+    QTimer::singleShot(0, qApp, []() { qApp->exit(0); });
+#endif
     qApp->quit();
 }
 

client/ui/systemtray_notificationhandler.cpp

@@ -42,7 +42,17 @@ SystemTrayNotificationHandler::SystemTrayNotificationHandler(QObject* parent) :
     m_trayActionQuit = m_menu.addAction(QIcon(":/images/tray/cancel.png"),
                                        tr("Quit") + " " + APPLICATION_NAME,
                                        this,
-                                       [&](){ qApp->quit(); });
+                                       [&](){
+#if defined(Q_OS_LINUX)
+                m_systemTrayIcon.hide();
+                m_systemTrayIcon.setContextMenu(nullptr);
+
+                for (auto w : qApp->topLevelWidgets()) {
+                    w->close();
+                }
+#endif
+        qApp->quit();
+        });
 
     m_systemTrayIcon.setContextMenu(&m_menu);
     setTrayState(Vpn::ConnectionState::Disconnected);