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