add control depend
This commit is contained in:
parent
12bd4bcc8b
commit
7830d5f4a4
|
@ -18,6 +18,7 @@ Build-Depends: debhelper (>=9),
|
|||
libkf5networkmanagerqt-dev (>= 5.36.0),
|
||||
libnm-dev,
|
||||
libcap-dev,
|
||||
libukcc-dev,
|
||||
Standards-Version: 4.5.0
|
||||
Rules-Requires-Root: no
|
||||
Homepage: https://github.com/ukui/kylin-nm
|
||||
|
|
|
@ -301,6 +301,19 @@ void WlanConnect::resortWifiList(ItemFrame *frame, QVector<QStringList> list)
|
|||
}
|
||||
} else {
|
||||
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();
|
||||
}
|
||||
|
||||
|
@ -470,7 +483,7 @@ void WlanConnect::onActiveConnectionChanged(QString deviceName, QString ssid, QS
|
|||
}
|
||||
WlanItem * item= nullptr;
|
||||
//device ssid 有可能均为空
|
||||
if (deviceName.isEmpty() && ssid.isEmpty()) {
|
||||
if (deviceName.isEmpty() || ssid.isEmpty()) {
|
||||
if (status == ACTIVATING || status == ACTIVATED) {
|
||||
return;
|
||||
}
|
||||
|
@ -491,9 +504,6 @@ void WlanConnect::onActiveConnectionChanged(QString deviceName, QString ssid, QS
|
|||
}
|
||||
}
|
||||
} else {
|
||||
if (deviceName.isEmpty() || ssid.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
if (!deviceFrameMap.contains(deviceName)) {
|
||||
return;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue