wpa_gui-qt4: remove lastWindowClosed() signal handler

[libeap.git] / wpa_supplicant / wpa_gui-qt4 / wpagui.cpp

diff --git a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
index ba11a83..dfec128 100644 (file)
--- a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
+++ b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
@@ -595,9 +595,6 @@ void WpaGui::scan()
                delete scanres;
        }
 
-       if (!isVisible())
-               show();
-
        scanres = new ScanResults();
        if (scanres == NULL)
                return;
@@ -614,9 +611,6 @@ void WpaGui::eventHistory()
                delete eh;
        }
 
-       if (!isVisible())
-               show();
-
        eh = new EventHistory();
        if (eh == NULL)
                return;
@@ -1093,6 +1087,8 @@ void WpaGui::selectAdapter( const QString & sel )
 
 void WpaGui::createTrayIcon()
 {
+       QApplication::setQuitOnLastWindowClosed(false);
+
        tray_icon = new QSystemTrayIcon(this);
        tray_icon->setToolTip(qAppName() + " - wpa_supplicant user interface");
        tray_icon->setIcon(QIcon(":/icons/wpa_gui.svg"));
@@ -1219,10 +1215,7 @@ void WpaGui::showTrayStatus()
 
 void WpaGui::fileExit()
 {
-       if (tray_icon)
-               tray_icon->hide();
-
-       close();
+       qApp->quit();
 }
 
 
@@ -1267,5 +1260,5 @@ void WpaGui::closeEvent(QCloseEvent *event)
                return;
        }
 
-       event->accept();
+       qApp->quit();
 }