diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2012-08-24 08:27:02 (GMT) |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-03 01:41:37 (GMT) |
commit | 44f3fb1eec2041c6587d3347f103ca6fa0a17dad (patch) | |
tree | e09fca3c381f8956ae9e6bacaf3bc4d28df51010 /src/dbus | |
parent | c776e155a904527a36a1ba9c788c344ca171780c (diff) | |
download | Qt-44f3fb1eec2041c6587d3347f103ca6fa0a17dad.zip Qt-44f3fb1eec2041c6587d3347f103ca6fa0a17dad.tar.gz Qt-44f3fb1eec2041c6587d3347f103ca6fa0a17dad.tar.bz2 |
QDBusPendingCall: add a missing QWaitCondition::wakeAll() call
In QDBusConnectionPrivate::waitForFinished(), threads that see
pcall->waitingForFinished == true go to sleep on
pcall->waitForFinishedCondition, but there was no call to
waitForFinishedCondition.wakeAll() anywhere in the code, so add it.
Change-Id: I8d068dc0cc4f20786eb40fd7e2bb9840d8b70c7f
(cherry-picked from qtbase commit 20d7763b19400c062a07f440cc601f486be4039b)
Reviewed-by: Peter Seiderer <ps.report@gmx.net>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/dbus')
-rw-r--r-- | src/dbus/qdbusintegrator.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp index 96e4a12..15278b2 100644 --- a/src/dbus/qdbusintegrator.cpp +++ b/src/dbus/qdbusintegrator.cpp @@ -1782,6 +1782,7 @@ void QDBusConnectionPrivate::waitForFinished(QDBusPendingCallPrivate *pcall) // QDBusConnectionPrivate::processFinishedCall() is called automatically } pcall->mutex.lock(); + pcall->waitForFinishedCondition.wakeAll(); } } |