diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-01-12 15:14:07 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-01-12 15:50:07 (GMT) |
| commit | 152e4ee249915b15241c5f37830f37bb569151b6 (patch) | |
| tree | 323a7455a64abdd440a160b9f8ada5a6b82a62b5 /src | |
| parent | 58a319f851bb5d1a4634df36215694ae1786fbd0 (diff) | |
| download | Qt-152e4ee249915b15241c5f37830f37bb569151b6.zip Qt-152e4ee249915b15241c5f37830f37bb569151b6.tar.gz Qt-152e4ee249915b15241c5f37830f37bb569151b6.tar.bz2 | |
Fix D-Bus calls with QDBus::BlockWithGui.
We must wait for a reply in case the reply hasn't been received yet,
not if it has already been received. Simple typo.
Task-number: QT-2307
Reviewed-by: Trust Me
Diffstat (limited to 'src')
| -rw-r--r-- | src/dbus/qdbusintegrator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp index 572c050..30fa0b6 100644 --- a/src/dbus/qdbusintegrator.cpp +++ b/src/dbus/qdbusintegrator.cpp @@ -1826,7 +1826,7 @@ QDBusMessage QDBusConnectionPrivate::sendWithReply(const QDBusMessage &message, QDBusPendingCallPrivate *pcall = sendWithReplyAsync(message, timeout); Q_ASSERT(pcall); - if (pcall->replyMessage.type() != QDBusMessage::InvalidMessage) { + if (pcall->replyMessage.type() == QDBusMessage::InvalidMessage) { pcall->watcherHelper = new QDBusPendingCallWatcherHelper; QEventLoop loop; loop.connect(pcall->watcherHelper, SIGNAL(reply(QDBusMessage)), SLOT(quit())); |