From 9ac6b01ec67ead91143f7c722dbfab38f94dc8c3 Mon Sep 17 00:00:00 2001
From: "Daniele E. Domenichelli" <daniele.domenichelli@gmail.com>
Date: Mon, 18 Apr 2011 11:21:09 -0500
Subject: QtDBus: Fix QDBusConnection::disconnectFromBus() for peer-to-peer
 connections

Merge-request: 2343
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
---
 src/dbus/qdbusconnection.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp
index f78d7da..0d28c30 100644
--- a/src/dbus/qdbusconnection.cpp
+++ b/src/dbus/qdbusconnection.cpp
@@ -424,6 +424,9 @@ void QDBusConnection::disconnectFromBus(const QString &name)
 {
     if (_q_manager()) {
         QMutexLocker locker(&_q_manager()->mutex);
+        QDBusConnectionPrivate *d = _q_manager()->connection(name);
+        if(d && d->mode != QDBusConnectionPrivate::ClientMode)
+            return;
         _q_manager()->removeConnection(name);
     }
 }
-- 
cgit v0.12