wpa_gui: Only move to WPS tab if inactive/disconnect and AP ready

[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 c0c207c..fb7d747 100644 (file)
--- a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
+++ b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
@@ -869,7 +869,9 @@ void WpaGui::processMsg(char *msg)
                                "Wi-Fi Protected Setup (WPS) AP\n"
                                "in active PBC mode found.");
                wpsStatusText->setText("WPS AP in active PBC mode found");
-               wpaguiTab->setCurrentWidget(wpsTab);
+               if (textStatus->text() == "INACTIVE" ||
+                   textStatus->text() == "DISCONNECTED")
+                       wpaguiTab->setCurrentWidget(wpsTab);
                wpsInstructions->setText("Press the PBC button on the screen "
                                         "to start registration");
        } else if (str_match(pos, WPS_EVENT_AP_AVAILABLE_PIN)) {
@@ -878,13 +880,14 @@ void WpaGui::processMsg(char *msg)
                                " in active PIN mode found.");
                wpsStatusText->setText("WPS AP with recently selected "
                                       "registrar");
-               wpaguiTab->setCurrentWidget(wpsTab);
+               if (textStatus->text() == "INACTIVE" ||
+                   textStatus->text() == "DISCONNECTED")
+                       wpaguiTab->setCurrentWidget(wpsTab);
        } else if (str_match(pos, WPS_EVENT_AP_AVAILABLE)) {
                showTrayMessage(QSystemTrayIcon::Information, 3,
                                "Wi-Fi Protected Setup (WPS)\n"
                                "AP detected.");
                wpsStatusText->setText("WPS AP detected");
-               wpaguiTab->setCurrentWidget(wpsTab);
        } else if (str_match(pos, WPS_EVENT_OVERLAP)) {
                showTrayMessage(QSystemTrayIcon::Information, 3,
                                "Wi-Fi Protected Setup (WPS)\n"