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

Fix bug change if of connected wired network do not effect

This commit is contained in:
chenlelin 2021-01-13 19:11:14 +08:00
parent 7d1aeee17b
commit 55db6aecab
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/backthread.cpp
View File

@ -85,7 +85,6 @@ IFace* BackThread::execGetIface()
// if type is wired network // if type is wired network
iface->lname = iname; iface->lname = iname;
qDebug() << "有线网的状态是 "<<istateStr;
if (istateStr == "unmanaged") { if (istateStr == "unmanaged") {
iface->lstate = 2; //switch of wired device is off iface->lstate = 2; //switch of wired device is off
} else if (istateStr == "disconnected" || istateStr == "unavailable") { } else if (istateStr == "disconnected" || istateStr == "unavailable") {

3
src/kylin-dbus-interface.cpp
View File

@ -344,9 +344,8 @@ void KylinDBus::getLanIpDNS(QString uuidName, bool isActNet)
dbusArg2nd.beginArray(); dbusArg2nd.beginArray();
while (!dbusArg2nd.atEnd()) { while (!dbusArg2nd.atEnd()) {
dbusArg2nd >> strDns;// append map to a vector here if you want to keep it dbusArg2nd >> strDns;// append map to a vector here if you want to keep it
// 当获取到dns时，dns肯定不会为0，所以就会有一个类似出栈的操作，就会走到atEnd尾部；
// 当获取到的dns为空时，就没有类似的出栈操作，获取到的数字就有问题；
if (strDns == 0) { if (strDns == 0) {
//dbusArg2nd为空时，strDns没有从dbusArg2nd获取到结果
dbusArg2nd.endArray(); dbusArg2nd.endArray();
} }
} }

6
src/mainwindow.cpp
View File

@ -1482,11 +1482,11 @@ void MainWindow::getLanListDone(QStringList slist)
} else { } else {
ccfAct->setLine(false); //最后一个item不显示下划线 ccfAct->setLine(false); //最后一个item不显示下划线
} }
\
if (!objKyDBus->dbusLanIpv4.isEmpty()) { if (!objKyDBus->dbusLanIpv4.isEmpty() && !objKyDBus->dbusActiveLanIpv4.isEmpty()) {
if (objKyDBus->dbusActiveLanIpv4 != objKyDBus->dbusLanIpv4) { if (objKyDBus->dbusActiveLanIpv4 != objKyDBus->dbusLanIpv4) {
//在第三方nm-connection-editor进行新的IP配置后，重新连接网络 //在第三方nm-connection-editor进行新的IP配置后，重新连接网络
//objKyDBus->connectWiredNet(nname); objKyDBus->connectWiredNet(nname);
} else if ((oldActLanName == actLanSsidName.at(kk)) && (oldDbusActLanDNS != objKyDBus->dbusActLanDNS)) { } else if ((oldActLanName == actLanSsidName.at(kk)) && (oldDbusActLanDNS != objKyDBus->dbusActLanDNS)) {
//在第三方nm-connection-editor进行新的DNS配置后，重新连接网络 //在第三方nm-connection-editor进行新的DNS配置后，重新连接网络
objKyDBus->connectWiredNet(nname); objKyDBus->connectWiredNet(nname);