diff options
| author | Albert Astals Cid <albert.astals@canonical.com> | 2015-03-06 16:53:03 +0100 |
|---|---|---|
| committer | Albert Astals Cid <albert.astals@canonical.com> | 2015-03-11 09:12:02 +0000 |
| commit | 268cc1dc996ba943895f24c5ca915c2b406b6097 (patch) | |
| tree | 180c4660392698775031f2e21ae709fd25da2db4 /src/dbus | |
| parent | 416438c2f35dc774e4c52a705c5a7098a69647fc (diff) | |
Lock dispatchLock before the regular lock
Fixes deadlock
Task-number: QTBUG-44836
Change-Id: Ie6def2d1e9684f4272d8920cd19c5765eef5f7c9
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/dbus')
| -rw-r--r-- | src/dbus/qdbusconnection.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp index a46df16ac5..f574b299cd 100644 --- a/src/dbus/qdbusconnection.cpp +++ b/src/dbus/qdbusconnection.cpp @@ -700,6 +700,7 @@ bool QDBusConnection::connect(const QString &service, const QString &path, const return false; } + QDBusDispatchLocker dispatchLocker(ConnectAction, d); QDBusWriteLocker locker(ConnectAction, d); return d->connectSignal(service, path, interface, name, argumentMatch, signature, receiver, slot); } |