add control depend

This commit is contained in:
jzxc95 2021-10-28 17:37:40 +08:00
parent 12bd4bcc8b
commit 7830d5f4a4
2 changed files with 15 additions and 4 deletions

1
debian/control vendored
View File

@ -18,6 +18,7 @@ Build-Depends: debhelper (>=9),
libkf5networkmanagerqt-dev (>= 5.36.0), libkf5networkmanagerqt-dev (>= 5.36.0),
libnm-dev, libnm-dev,
libcap-dev, libcap-dev,
libukcc-dev,
Standards-Version: 4.5.0 Standards-Version: 4.5.0
Rules-Requires-Root: no Rules-Requires-Root: no
Homepage: https://github.com/ukui/kylin-nm Homepage: https://github.com/ukui/kylin-nm

View File

@ -301,6 +301,19 @@ void WlanConnect::resortWifiList(ItemFrame *frame, QVector<QStringList> list)
} }
} else { } else {
qDebug() << " no active connection when resort"; qDebug() << " no active connection when resort";
if (!frame->uuid.isEmpty()) {
QMap<QString, WlanItem*>::iterator itemIter;
for (itemIter = frame->itemMap.begin(); itemIter != frame->itemMap.end(); itemIter++) {
if (itemIter.value()->uuid == frame->uuid ) {
WlanItem * item= nullptr;
item = itemIter.value();
qDebug() << "a active connect missing when resort";
itemIter.value()->uuid.clear();
itemActiveConnectionStatusChanged(item, DEACTIVATED);
break;
}
}
}
frame->uuid.clear(); frame->uuid.clear();
} }
@ -470,7 +483,7 @@ void WlanConnect::onActiveConnectionChanged(QString deviceName, QString ssid, QS
} }
WlanItem * item= nullptr; WlanItem * item= nullptr;
//device ssid 有可能均为空 //device ssid 有可能均为空
if (deviceName.isEmpty() && ssid.isEmpty()) { if (deviceName.isEmpty() || ssid.isEmpty()) {
if (status == ACTIVATING || status == ACTIVATED) { if (status == ACTIVATING || status == ACTIVATED) {
return; return;
} }
@ -491,9 +504,6 @@ void WlanConnect::onActiveConnectionChanged(QString deviceName, QString ssid, QS
} }
} }
} else { } else {
if (deviceName.isEmpty() || ssid.isEmpty()) {
return;
}
if (!deviceFrameMap.contains(deviceName)) { if (!deviceFrameMap.contains(deviceName)) {
return; return;
} }