packages/ukui-bluetooth
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix startup segfault issue

Browse Source
This commit is contained in:
tanyulong2021 2022-08-03 15:19:24 +08:00
parent f875ed86c1
commit a71eb7b48d
2 changed files with 48 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
0001-fix-startup-segfault-issue.patch Normal file
View File

@ -0,0 +1,42 @@
From 9904da94d3e0c259f489d56abf37834052090b99 Mon Sep 17 00:00:00 2001
From: tanyulong2021 <tanyulong@kylinos.cn>
Date: Wed, 3 Aug 2022 19:16:00 +0800
Subject: [PATCH] fix startup segfault issue
---
ukui-bluetooth/main/featureswidget.cpp | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/ukui-bluetooth/main/featureswidget.cpp b/ukui-bluetooth/main/featureswidget.cpp
index e753930..314de45 100644
--- a/ukui-bluetooth/main/featureswidget.cpp
+++ b/ukui-bluetooth/main/featureswidget.cpp
@@ -33,7 +33,7 @@ enum {
static guint watch = 0;
bool spe_bt_node = false;
-bool not_hci_node = true;
+bool not_hci_node = false;
bool M_adapter_flag = false;
bool M_power_on = false;
@@ -605,10 +605,12 @@ void FeaturesWidget::InitTrayMenu()
QAction *settins_action = new QAction(tr("Bluetooth settings"),tray_Menu);
settins_action->setCheckable(true);
tray_Menu->addAction(settins_action);
- //tray_Menu->move(bluetooth_tray_icon->geometry().x()+16,bluetooth_tray_icon->geometry().y()-50);
- //tray_Menu->exec();
- setWidgetPosition();
-
+ if(!QFile("/usr/bin/ukui-panel").exists()){
+ tray_Menu->move(bluetooth_tray_icon->geometry().x()+16,bluetooth_tray_icon->geometry().y()-50);
+ tray_Menu->exec();
+ }else{
+ setWidgetPosition();
+ }
}
void FeaturesWidget::setWidgetPosition()
--
2.33.0

9
ukui-bluetooth.spec
View File

@ -2,7 +2,7 @@
Name: ukui-bluetooth
Version: 1.0.2
Release: 2
Release: 3
Summary: Advanced ukui bluetooth
License: GPLv2+
URL: http://www.ukui.org
@ -26,14 +26,14 @@ Requires: bluez >= 5.0
Requires: bluez-obexd
Requires: peony-extensions
Patch0: 0001-fix-startup-segfault-issue.patch
%description
A lightweight Bluetooth tool based on libkf5bluezqt6 on the UKUI desktop environment
%prep
%setup -q
%patch0 -p1
%build
mkdir build && cd build
@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Wed Aug 03 2022 tanyulong <tanyulong@kylinos.cn> - 1.0.2-3
- fix startup segfault issue
* Tue Jun 21 2022 peijiankang <peijiankang@kylinos.cn> - 1.0.2-2
- Remove kf5-bluez-qt-common