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

Merge branch 'yhkylin/v101-tablet-fork' into 'yhkylin/v101-tablet' 

解决平板设备外接有线网卡，再拔掉网卡前端网络的崩溃问题

See merge request kylinos-src/kylin-nm!14
This commit is contained in:
赵世旭 2022-10-21 07:22:27 +00:00
parent 55491edece 37a510da0d
commit 2dfe5479b0
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
debian/changelog vendored
View File

@ -1,3 +1,12 @@
kylin-nm (3.20.1.6-ok7) v101; urgency=medium
* BUG号：无
* 需求号：无
* 其他改动：解决平板设备因插拔有线网卡造成的奔溃问题
* 影响域：VPN托盘区造成的崩溃问题
-- chenxuechao <chenxuechao@kylinos.cn> Fri, 21 Oct 2022 15:17:54 +0800
kylin-nm (3.20.1.6-ok6) v101; urgency=medium kylin-nm (3.20.1.6-ok6) v101; urgency=medium
* BUG号： * BUG号：

6
src/backend/dbus-interface/kylinconnectresource.cpp
View File

@ -232,8 +232,10 @@ void KyConnectResourse::getVpnAndVirtualConnections(QList<KyConnectItem *> &conn
} }
NetworkManager::Device::Ptr devicePtr = nullptr; NetworkManager::Device::Ptr devicePtr = nullptr;
devicePtr = m_networkResourceInstance->findDeviceInterface(connectPtr->settings()->interfaceName()); devicePtr = m_networkResourceInstance->findDeviceInterface(connectPtr->settings()->interfaceName());
if (NetworkManager::ConnectionSettings::ConnectionType::Wired == connectPtr->settings()->connectionType() && !devicePtr->udi().startsWith("/sys/devices/virtual/net")) { if (NetworkManager::ConnectionSettings::ConnectionType::Wired == connectPtr->settings()->connectionType()) {
continue; if (devicePtr == nullptr || !devicePtr->udi().startsWith("/sys/devices/virtual/net")) {
continue;
}
} }
QString devName = ""; QString devName = "";
if (!devicePtr.isNull()) { if (!devicePtr.isNull()) {