openkylin
/
kylin-nm
mirror of https://gitee.com/openkylin/kylin-nm.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

FixBug: The same enterprise WiFi can open multiple connection Windows at the same time BUGLINK:https://172.17.50.104/biz/bug-view-94123.html

This commit is contained in:
Jinxujie 2021-12-01 15:58:23 +08:00
parent 897e2f06d6
commit a252fb6fcf
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/frontend/list-items/wlanlistitem.cpp
View File

@ -1,6 +1,7 @@
#include "wlanlistitem.h"
#include <QResizeEvent>
#include "enterprisewlandialog.h"
#include <kwindowsystem.h>
#include <kwindowsystem_export.h>
#define EMPTY_SSID "EMPTY_SSID"
#define LOG_FLAG "[WlanListItem]"
@ -405,11 +406,12 @@ void WlanListItem::onNetButtonClicked()
if (!this->m_connectButton->isVisible() && m_wirelessNetItem.m_secuType != "") {
if (m_wirelessNetItem.m_secuType.contains("802.1x", Qt::CaseInsensitive)) {
if (isEnterpriseWlanDialogShow) {
if (isEnterpriseWlanDialogShow && enterpriseWlanDialog != nullptr) {
qDebug() << LOG_FLAG <<"EnterpriseWlanDialog is show do not show again!";
KWindowSystem::raiseWindow(enterpriseWlanDialog->winId());
return;
} else {
EnterpriseWlanDialog *enterpriseWlanDialog = new EnterpriseWlanDialog(m_wirelessNetItem, m_wlanDevice, this);
enterpriseWlanDialog = new EnterpriseWlanDialog(m_wirelessNetItem, m_wlanDevice, this);
connect(enterpriseWlanDialog, &EnterpriseWlanDialog::enterpriseWlanDialogClose, this, &WlanListItem::onEnterpriseWlanDialogClose);
enterpriseWlanDialog->show();
isEnterpriseWlanDialogShow = true;

2
src/frontend/list-items/wlanlistitem.h
View File

@ -8,6 +8,7 @@
#include <QCheckBox>
#include "kylinactiveconnectresource.h"
#include <QAction>
#include "enterprisewlandialog.h"
#include <networkmanagerqt/wirelesssecuritysetting.h>
@ -63,6 +64,7 @@ private:
private:
KyWirelessNetItem m_wirelessNetItem;
KyWirelessConnectOperation *m_wirelessConnectOperation = nullptr;
EnterpriseWlanDialog *enterpriseWlanDialog = nullptr;
bool m_hasPwd = true;
QString m_wlanDevice;