rdieter pushed to libbluedevil (f20). "followup kded4 crasher (kde#346329)"

[notifications at fedoraproject.org]

>From 5567e69ca85c67e5097471a3b3a1fbed5256640c Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Tue, 5 May 2015 13:04:10 -0500
Subject: followup kded4 crasher (kde#346329)


diff --git a/0003-Only-delete-adapter-when-removed-from-m_adapters-has.patch b/0003-Only-delete-adapter-when-removed-from-m_adapters-has.patch
new file mode 100644
index 0000000..c250104
--- /dev/null
+++ b/0003-Only-delete-adapter-when-removed-from-m_adapters-has.patch
@@ -0,0 +1,37 @@
+From 241d21361a677fa44b3bd0c53e65f12cd23c5ba3 Mon Sep 17 00:00:00 2001
+From: David Rosca <nowrep at gmail.com>
+Date: Tue, 5 May 2015 17:04:06 +0200
+Subject: [PATCH 3/3] Only delete adapter when removed from m_adapters hash
+
+BUG: 346329
+---
+ bluedevil/bluedevilmanager_p.cpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/bluedevil/bluedevilmanager_p.cpp b/bluedevil/bluedevilmanager_p.cpp
+index 3c45f2a..af63593 100644
+--- a/bluedevil/bluedevilmanager_p.cpp
++++ b/bluedevil/bluedevilmanager_p.cpp
+@@ -162,6 +162,10 @@ void ManagerPrivate::_k_interfacesRemoved(const QDBusObjectPath &objectPath, con
+             }
+             if (adapter) {
+                 emit m_q->adapterRemoved(adapter);
++
++                if (adapter->devices().isEmpty()) {
++                    adapter->deleteLater();
++                }
+             }
+             if (m_adapters.isEmpty()) {
+                 emit m_q->usableAdapterChanged(0);
+@@ -180,7 +184,7 @@ void ManagerPrivate::_k_interfacesRemoved(const QDBusObjectPath &objectPath, con
+             if (adapter) {
+                 adapter->removeDevice(object);
+ 
+-                if (adapter->devices().isEmpty()) {
++                if (adapter->devices().isEmpty() && !m_adapters.values().contains(adapter)) {
+                     adapter->deleteLater();
+                 }
+             }
+-- 
+2.4.0
+
diff --git a/libbluedevil.spec b/libbluedevil.spec
index 2515b16..9fb1954 100644
--- a/libbluedevil.spec
+++ b/libbluedevil.spec
@@ -4,7 +4,7 @@
 Name:           libbluedevil
 Summary:        A Qt wrapper for bluez
 Version:        2.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 License:        LGPLv2+
 URL:            https://projects.kde.org/projects/playground/libs/libbluedevil 
@@ -19,6 +19,7 @@ Source0: http://download.kde.org/%{stable}/libbluedevil/%{version}%{?pre:-%{pre}
 ## upstream patches
 Patch1: 0001-Adapter-Add-back-alias-and-setAlias-for-binary-compa.patch
 Patch2: 0002-Delete-adapter-only-after-all-devices-from-the-adapt.patch
+patch3: 0003-Only-delete-adapter-when-removed-from-m_adapters-has.patch
 
 BuildRequires:  automoc4
 BuildRequires:  cmake
@@ -67,6 +68,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %changelog
+* Tue May 05 2015 Rex Dieter <rdieter at fedoraproject.org> 2.1-4
+- followup kded4 crasher (kde#346329)
+
 * Tue Apr 28 2015 Rex Dieter <rdieter at fedoraproject.org> 2.1-3
 - kded4 crash when resume from suspend (kde#346329)
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/libbluedevil.git/commit/?h=f20&id=5567e69ca85c67e5097471a3b3a1fbed5256640c