From 60bd51b4bc46ac06134e5e38d9ff50348997318b Mon Sep 17 00:00:00 2001
From: peijiankang <peijiankang@kylinos.cn>
Date: Thu, 27 Jul 2023 10:35:29 +0800
Subject: [PATCH] add 0002-fix-coredump-of-kylin-nm.patch

(cherry picked from commit 23e73f2ec14f4a736be1359399a76ce7201a4f9f)
---
 0002-fix-coredump-of-kylin-nm.patch | 67 +++++++++++++++++++++++++++++
 kylin-nm.spec                       | 10 ++++-
 2 files changed, 76 insertions(+), 1 deletion(-)
 create mode 100644 0002-fix-coredump-of-kylin-nm.patch

diff --git a/0002-fix-coredump-of-kylin-nm.patch b/0002-fix-coredump-of-kylin-nm.patch
new file mode 100644
index 0000000..cd0bfc3
--- /dev/null
+++ b/0002-fix-coredump-of-kylin-nm.patch
@@ -0,0 +1,67 @@
+From 8d2bcb04f9277f409650197fd7b0f3a423bdc901 Mon Sep 17 00:00:00 2001
+From: peijiankang <peijiankang@kylinos.cn>
+Date: Mon, 17 Jul 2023 11:38:50 +0800
+Subject: [PATCH] fix coredump of kylin-nm
+
+---
+ .../kylinactiveconnectresource.cpp            | 26 ++++++++++---------
+ .../dbus-interface/kywirelessnetresource.cpp  |  5 +++-
+ 2 files changed, 18 insertions(+), 13 deletions(-)
+
+diff --git a/src/backend/dbus-interface/kylinactiveconnectresource.cpp b/src/backend/dbus-interface/kylinactiveconnectresource.cpp
+index e56de5a..b5f1bfb 100644
+--- a/src/backend/dbus-interface/kylinactiveconnectresource.cpp
++++ b/src/backend/dbus-interface/kylinactiveconnectresource.cpp
+@@ -173,19 +173,21 @@ void KyActiveConnectResourse::getActiveConnectionList(QString deviceName,
+             QString ifaceUni = interfaces.at(index);
+             NetworkManager::Device:: Ptr devicePtr =
+                         m_networkResourceInstance->findDeviceUni(ifaceUni);
+-            if (devicePtr->interfaceName() == deviceName) {
+-                KyConnectItem *activeConnectItem =
+-                        getActiveConnectionItem(activeConnectPtr);
+-                if (nullptr != activeConnectItem) {
+-                    activeConnectItem->m_ifaceName = deviceName;
+-                    activeConnectItem->m_itemType = connectionType;
+-                    activeConnectItemList << activeConnectItem;
+-                    //activeConnectItem->dumpInfo();
++	    if(devicePtr){
++                if (devicePtr->interfaceName() == deviceName) {
++                    KyConnectItem *activeConnectItem =
++                            getActiveConnectionItem(activeConnectPtr);
++                    if (nullptr != activeConnectItem) {
++                        activeConnectItem->m_ifaceName = deviceName;
++                        activeConnectItem->m_itemType = connectionType;
++                        activeConnectItemList << activeConnectItem;
++                        //activeConnectItem->dumpInfo();
++                    }
++
++                    activeConnectPtr = nullptr;
++                    break;
+                 }
+-
+-                activeConnectPtr = nullptr;
+-                break;
+-            }
++	    }
+         }
+     }
+ 
+diff --git a/src/backend/dbus-interface/kywirelessnetresource.cpp b/src/backend/dbus-interface/kywirelessnetresource.cpp
+index 386f863..583d2a4 100644
+--- a/src/backend/dbus-interface/kywirelessnetresource.cpp
++++ b/src/backend/dbus-interface/kywirelessnetresource.cpp
+@@ -307,7 +307,10 @@ void KyWirelessNetResource::getDeviceByUuid(const QString uuid, QString &deviceN
+             QString ifaceUni = interfaces.at(0);
+             NetworkManager::Device:: Ptr devicePtr =
+                     m_networkResourceInstance->findDeviceUni(ifaceUni);
+-            deviceName = devicePtr->interfaceName();
++	    if(devicePtr)
++                deviceName = devicePtr->interfaceName();
++	    else
++                qDebug() << LOG_FLAG << "get device of active is NULL";
+             return;
+         } else {
+             qDebug() << LOG_FLAG << "get device of active connection failed.";
+-- 
+2.33.0
+
diff --git a/kylin-nm.spec b/kylin-nm.spec
index f060554..6e15b76 100644
--- a/kylin-nm.spec
+++ b/kylin-nm.spec
@@ -1,11 +1,12 @@
 Name:           kylin-nm
 Version:        3.1.1
-Release:        3
+Release:        4
 Summary:        Gui Applet tool for display and edit network simply
 License:        GPL-3+
 URL:            http://www.ukui.org
 Source0:        %{name}-%{version}.tar.gz
 Patch01:        0001-fix-coredump-of-kylin-nm.patch
+Patch02:        0002-fix-coredump-of-kylin-nm.patch
 
 BuildRequires:  qt5-qtbase-devel
 BuildRequires:  qtchooser
@@ -28,6 +29,7 @@ Requires: libukcc-devel
 %prep
 %setup -q
 %patch01 -p1
+%patch02 -p1
 
 %build
 %{qmake_qt5} %{_qt5_qmake_flags} CONFIG+=enable-by-default  kylin-nm.pro	
@@ -60,6 +62,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jul 17 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.1-4
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC: add 0002-fix-coredump-of-kylin-nm.patch 
+
 * Fri Jun 09 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.1-3
 - add 0001-fix-coredump-of-kylin-nm.patch