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

Fix bug wired network connect looply

This commit is contained in:
chenlelin 2021-01-07 19:27:26 +08:00
parent 7b8dc8b0ac
commit f6cc0d42ec
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1087,6 +1087,7 @@ void KylinDBus::connectWiredNet(QString netName)
} }
dbusArgs.endArray(); dbusArgs.endArray();
//获取到所需的信息后，接下来进行连接
QDBusReply<QDBusObjectPath> connectionReply = m_interface.call("ActivateConnection", QDBusReply<QDBusObjectPath> connectionReply = m_interface.call("ActivateConnection",
QVariant::fromValue(objNet), QVariant::fromValue(objNet),
QVariant::fromValue(connWiredPath), QVariant::fromValue(connWiredPath),

5
src/mainwindow.cpp
View File

@ -1501,10 +1501,10 @@ void MainWindow::getLanListDone(QStringList slist)
if (!objKyDBus->dbusLanIpv4.isEmpty()) { if (!objKyDBus->dbusLanIpv4.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);
} }
} }
@ -1705,7 +1705,6 @@ void MainWindow::loadWifiListDone(QStringList slist)
} }
if (wname != "" && wname != "--") { if (wname != "" && wname != "--") {
// 当前连接的wifi // 当前连接的wifi
// if (wname == actWifiName) {
if (wname == actWifissid) { if (wname == actWifissid) {
connect(ccf, SIGNAL(selectedOneWifiForm(QString,int)), this, SLOT(oneTopWifiFormSelected(QString,int))); connect(ccf, SIGNAL(selectedOneWifiForm(QString,int)), this, SLOT(oneTopWifiFormSelected(QString,int)));
connect(ccf, SIGNAL(disconnActiveWifi()), this, SLOT(activeWifiDisconn())); connect(ccf, SIGNAL(disconnActiveWifi()), this, SLOT(activeWifiDisconn()));