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

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

See merge request kylinos-src/kylin-nm!14

debian/changelog

@@ -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
 
   * BUG号：

src/backend/dbus-interface/kylinconnectresource.cpp

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