From 43df804cab29120a2c75f2c641d07e42c7edea1a Mon Sep 17 00:00:00 2001 From: chenxuechao Date: Fri, 21 Oct 2022 16:35:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=9B=A0=E6=9C=89?= =?UTF-8?q?=E7=BA=BF=E8=BF=9E=E6=8E=A5=E6=B2=A1=E6=9C=89=E6=8C=87=E5=AE=9A?= =?UTF-8?q?=E7=BD=91=E5=8D=A1=E9=80=A0=E6=88=90=E7=9A=84VPN=E5=B4=A9?= =?UTF-8?q?=E6=BA=83=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/dbus-interface/kylinconnectresource.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/backend/dbus-interface/kylinconnectresource.cpp b/src/backend/dbus-interface/kylinconnectresource.cpp index 3b59d0ad..a2d02a3d 100644 --- a/src/backend/dbus-interface/kylinconnectresource.cpp +++ b/src/backend/dbus-interface/kylinconnectresource.cpp @@ -194,8 +194,10 @@ void KyConnectResourse::getVpnAndVirtualConnections(QList &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()) { From 8a3158268ad1b4071e3a7c057b29e2545371863a Mon Sep 17 00:00:00 2001 From: chenxuechao Date: Fri, 21 Oct 2022 16:37:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9changelog?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index f02d28ed..01534794 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +kylin-nm (3.14.0.0+0512-2k11) v101; urgency=medium + + * 修改因有线连接未指定网卡造成VPN托盘崩溃的问题 + + -- zhaoshixu Fri, 21 Oct 2022 16:35:19 +0800 + kylin-nm (3.14.0.0+0512-2k10) v101; urgency=medium * 托盘vpn需求