Fix bug get wired list is empty
This commit is contained in:
parent
8229c92ed0
commit
a1d2abfe19
|
@ -86,11 +86,11 @@ IFace* BackThread::execGetIface()
|
|||
iface->lname = iname;
|
||||
|
||||
if (istateStr == "unmanaged") {
|
||||
iface->lstate = 3; //switch of wired device is off
|
||||
iface->lstate = 2; //switch of wired device is off
|
||||
} else if (istateStr == "disconnected" || istateStr == "unavailable") {
|
||||
iface->lstate = 3; //wired network is disconnected
|
||||
iface->lstate = 1; //wired network is disconnected
|
||||
} else if (istateStr == "connected") {
|
||||
iface->lstate = 3; //wired network is connected
|
||||
iface->lstate = 0; //wired network is connected
|
||||
} else {
|
||||
//连接中,正在配置
|
||||
iface->lstate = 3;
|
||||
|
|
|
@ -45,7 +45,7 @@ KSimpleNM::~KSimpleNM()
|
|||
//获取有线网络列表数据
|
||||
void KSimpleNM::execGetLanList()
|
||||
{
|
||||
if (isExecutingGetLanList || isExecutingGetWifiList) {
|
||||
if (isExecutingGetLanList) {
|
||||
syslog(LOG_DEBUG, "It is running getting lan list when getting lan list");
|
||||
qDebug()<<"debug: it is running getting lan list when getting lan list";
|
||||
isUseOldLanSlist = true;
|
||||
|
@ -63,7 +63,7 @@ void KSimpleNM::execGetLanList()
|
|||
//获取无线网络列表数据
|
||||
void KSimpleNM::execGetWifiList()
|
||||
{
|
||||
if (isExecutingGetWifiList || isExecutingGetLanList) {
|
||||
if (isExecutingGetWifiList) {
|
||||
syslog(LOG_DEBUG, "It is running getting wifi list when getting wifi list");
|
||||
qDebug()<<"debug: it is running getting wifi list when getting wifi list";
|
||||
isUseOldWifiSlist = true;
|
||||
|
|
|
@ -1435,8 +1435,8 @@ void MainWindow::getLanListDone(QStringList slist)
|
|||
macInterface = objKyDBus->getLanMAC(objKyDBus->dbusIfName); //有限网卡对应的mac地址
|
||||
|
||||
if (macLan!="" && macLan!="--" && macLan != macInterface) {
|
||||
//continue; //有线网的permenant mac地址与网卡的地址不同,则不在列表中显示
|
||||
macInterface = macLan;
|
||||
continue; //有线网的permenant mac地址与网卡的地址不同,则不在列表中显示
|
||||
//macInterface = macLan;
|
||||
}
|
||||
} else {
|
||||
mIfName = objKyDBus->multiWiredIfName.at(0); //使用默认的网络接口
|
||||
|
|
Loading…
Reference in New Issue