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

fix

This commit is contained in:
jzxc95 2021-11-29 11:44:16 +08:00
parent 4867fc4974
commit c85eb1f353
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/frontend/mainwindow.cpp
View File

@ -96,7 +96,7 @@ void MainWindow::firstlyStart()
});
m_secondaryStartTimer->start(5 * 1000);
createPageMap.clear();
m_createPagePtrMap.clear();
//加载key ring
agent_init();
@ -615,22 +615,21 @@ void MainWindow::showPropertyWidget(QString devName, QString ssid)
void MainWindow::showCreateWiredConnectWidget(const QString devName)
{
qDebug() << "showCreateWiredConnectWidget! devName = " << devName;
if (createPageMap.contains(devName)) {
if (createPageMap[devName] != nullptr) {
if (m_createPagePtrMap.contains(devName)) {
if (m_createPagePtrMap[devName] != nullptr) {
qDebug() << "showCreateWiredConnectWidget" << devName << "already create,just raise";
KWindowSystem::raiseWindow(createPageMap[devName]->winId());
KWindowSystem::raiseWindow(m_createPagePtrMap[devName]->winId());
return;
}
}
NetDetail *netDetail = new NetDetail(devName, "", "", false, false, true, this);
connect(netDetail, &NetDetail::createPageClose, [&](QString interfaceName){
qDebug() << interfaceName;
if (createPageMap.contains(interfaceName)) {
createPageMap[interfaceName] = nullptr;
if (m_createPagePtrMap.contains(interfaceName)) {
m_createPagePtrMap[interfaceName] = nullptr;
}
});
createPageMap.insert(devName, netDetail);
m_createPagePtrMap.insert(devName, netDetail);
netDetail->show();
}

2
src/frontend/mainwindow.h
View File

@ -141,7 +141,7 @@ private:
IconActiveType iconStatus = IconActiveType::NOT_CONNECTED;
QMap<QString, NetDetail*> createPageMap;
QMap<QString, NetDetail*> m_createPagePtrMap;
private slots:
void onTrayIconActivated();