fix coredump of kylin-nm

(cherry picked from commit d18534d1f2b70e60b6db493770054b737c697343)
This commit is contained in:
peijiankang 2023-06-09 16:59:12 +08:00 committed by openeuler-sync-bot
parent 117dd1a754
commit 114a31f863
2 changed files with 47 additions and 4 deletions

View File

@ -0,0 +1,40 @@
From 9c02a1d3ebee74fcaedfd892070694a846da81cc Mon Sep 17 00:00:00 2001
From: peijiankang <peijiankang@kylinos.cn>
Date: Fri, 9 Jun 2023 16:55:08 +0800
Subject: [PATCH] fix coredump of kylin-nm
---
src/main.cpp | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/src/main.cpp b/src/main.cpp
index 63bbeba..d27f5d3 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -96,11 +96,8 @@ int main(int argc, char *argv[])
QApplication::setQuitOnLastWindowClosed(false);
- QThread thread;
KyNetworkResourceManager *p_networkResource = KyNetworkResourceManager::getInstance();
- p_networkResource->moveToThread(&thread);
- QObject::connect(&thread, SIGNAL(started()), p_networkResource, SLOT(onInitNetwork()));
- thread.start();
+ p_networkResource->onInitNetwork();
// Internationalization
QString locale = QLocale::system().name();
@@ -123,10 +120,6 @@ int main(int argc, char *argv[])
qWarning() << "QtBase Translations load fail";
}
- while (!p_networkResource->NetworkManagerIsInited()) {
- ::usleep(1000);
- }
-
MainWindow w;
a.setActivationWindow(&w);
w.setProperty("useStyleWindowManager", false); //禁用拖动
--
2.33.0

View File

@ -1,10 +1,11 @@
Name: kylin-nm
Version: 3.1.1
Release: 2
Release: 3
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
BuildRequires: qt5-qtbase-devel
BuildRequires: qtchooser
@ -26,6 +27,7 @@ Requires: libukcc-devel
%prep
%setup -q
%patch01 -p1
%build
%{qmake_qt5} %{_qt5_qmake_flags} CONFIG+=enable-by-default kylin-nm.pro
@ -50,9 +52,7 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/doc/kylin-nm/changelog.gz
%{_datadir}/doc/kylin-nm/copyright
%{_mandir}/man1/kylin-nm.1.gz
#/etc/dbus-1/system.d/com.kylin.NetworkManager.qt.systemdbus.conf
#/usr/share/dbus-1/system-services/com.kylin.NetworkManager.qt.systemdbus.service
/usr/lib64/ukui-control-center/*.so
%{_libdir}/ukui-control-center/*.so
%{_datadir}/glib-2.0/schemas/org.ukui.kylin-nm.switch.gschema.xml
%{_datadir}/kylin-nm/mobilehotspot/*
%{_datadir}/kylin-nm/netconnect/*
@ -60,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Fri Jun 09 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.1-3
- add 0001-fix-coredump-of-kylin-nm.patch
* Wed Mar 01 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.1-2
- add libukcc-devel Requires