diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-03-07 16:53:34 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-03-07 17:08:56 +0100 |
| commit | f93032848e6b090b671d0035557a32bed65d2b4e (patch) | |
| tree | 8cb6a0705c19d3cc6002f70ed5dddd0dd7adcab9 /src/dbus/qdbusconnection.cpp | |
| parent | bcd88d8e9984bff664740aae3cff708a069dbbdd (diff) | |
| parent | d0cdc7ad1e2728caf363abf328b2ad81f2ed5a5b (diff) | |
Merge remote-tracking branch 'origin/5.6.0' into 5.7v5.7.0-alpha1
Change-Id: Idcda6d52266f557ce4a819b6669f6797473a48a2
Diffstat (limited to 'src/dbus/qdbusconnection.cpp')
| -rw-r--r-- | src/dbus/qdbusconnection.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp index 3f2e80cdac..ea8c2b0311 100644 --- a/src/dbus/qdbusconnection.cpp +++ b/src/dbus/qdbusconnection.cpp @@ -214,7 +214,7 @@ QDBusConnectionPrivate *QDBusConnectionManager::connectToBus(QDBusConnection::Bu data.suspendedDelivery = suspendedDelivery; emit connectionRequested(&data); - if (suspendedDelivery) { + if (suspendedDelivery && data.result->connection) { data.result->ref.ref(); QDBusConnectionDispatchEnabler *o = new QDBusConnectionDispatchEnabler(data.result); QTimer::singleShot(0, o, SLOT(execute())); @@ -297,7 +297,7 @@ void QDBusConnectionManager::executeConnectionRequest(QDBusConnectionManager::Co // will lock in QDBusConnectionPrivate::connectRelay() d->setConnection(c, error); d->createBusService(); - if (data->suspendedDelivery) + if (c && data->suspendedDelivery) d->setDispatchEnabled(false); } } |