!3 fix ukui bluetooth will have a segfault when pairing times out

From: @tanyulong2021
Reviewed-by: @dou33
Signed-off-by: @dou33
This commit is contained in:
openeuler-ci-bot 2021-10-31 07:21:49 +00:00 committed by Gitee
commit 07873e43d4
2 changed files with 31 additions and 1 deletions

View File

@ -0,0 +1,25 @@
From 20277829b38feb83ec7da521c9e9a581f710931c Mon Sep 17 00:00:00 2001
From: tanyulong <tanyulong@kylinos.cn>
Date: Sat, 30 Oct 2021 16:50:00 +0800
Subject: [PATCH] fix ukui-bluetooth will have a segfault
---
ukui-bluetooth/agent/bluetoothagent.cpp | 2 --
1 file changed, 2 deletions(-)
diff --git a/ukui-bluetooth/agent/bluetoothagent.cpp b/ukui-bluetooth/agent/bluetoothagent.cpp
index 842c275..067d910 100644
--- a/ukui-bluetooth/agent/bluetoothagent.cpp
+++ b/ukui-bluetooth/agent/bluetoothagent.cpp
@@ -123,8 +123,6 @@ void BluetoothAgent::requestConfirmation(BluezQt::DevicePtr device, const QStrin
connect(m_device.data(), &BluezQt::Device::pairedChanged, this, [=](bool st){
if (st == false) {
request.reject();
- if (pincodewidget != nullptr)
- pincodewidget->close();
}
return;
});
--
2.30.0

View File

@ -2,13 +2,14 @@
Name: ukui-bluetooth
Version: 1.0.0
Release: 2
Release: 3
Summary: Advanced ukui bluetooth
License: GPLv2+
URL: http://www.ukui.org
Source0: %{name}-%{version}.tar.gz
patch0: 0001-fix-Bluetooth-pulled-up-by-the-session-manager-and-exits-abnormally.patch
patch1: 0002-fix-ukui-bluetooth-will-have-a-segfault-when-times-out.patch
BuildRequires: gsettings-qt-devel
BuildRequires: glib2-devel
@ -38,6 +39,7 @@ Simple bluetooth tool for ukui desktop environment
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%build
mkdir build && cd build
@ -73,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Sat Oct 30 2021 tanyulong <tanyulong@kylinos.cn> - 1.0.0-3
- After the Bluetooth pairing between the mobile phone and the system has timed out, and ukui-bluetooth will have a segmentation error
* Fri Oct 29 2021 tanyulong <tanyulong@kylinos.cn> - 1.0.0-2
- For a machine without Bluetooth function,Bluetooth is pulled up by the session manager and exits abnormally