diff options
author | Thiago Macieira <thiago@kde.org> | 2006-04-29 10:07:42 +0000 |
---|---|---|
committer | Thiago Macieira <thiago@kde.org> | 2006-04-29 10:07:42 +0000 |
commit | 47999a1c43302e9e80884b4018c416327fe675d2 (patch) | |
tree | b105c41e50ecee5cec22325647ba04ecaa249cc8 /qt | |
parent | 3658482cebe5c1e356859a28584e14898923046d (diff) |
* qt/qdbusintegrator.cpp: Fix assertion failure spotted by
Brad Hards.
Diffstat (limited to 'qt')
-rw-r--r-- | qt/qdbusintegrator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qt/qdbusintegrator.cpp b/qt/qdbusintegrator.cpp index 4dabd435..bef8268d 100644 --- a/qt/qdbusintegrator.cpp +++ b/qt/qdbusintegrator.cpp @@ -575,7 +575,6 @@ bool QDBusConnectionPrivate::activateSignal(const QDBusConnectionPrivate::Signal // Slots receive read-only copies of the message (i.e., pass by value or by const-ref) CallDeliveryEvent *call = prepareReply(hook.obj, hook.midx, hook.params, msg); if (call) { - call->conn = this; postCallDeliveryEvent(call); return true; } @@ -633,7 +632,6 @@ bool QDBusConnectionPrivate::activateCall(QObject* object, int flags, // found the slot to be called // prepare for the call: CallDeliveryEvent *call = new CallDeliveryEvent; - call->conn = this; // parameters: call->object = object; @@ -652,6 +650,8 @@ bool QDBusConnectionPrivate::activateCall(QObject* object, int flags, void QDBusConnectionPrivate::postCallDeliveryEvent(CallDeliveryEvent *data) { + Q_ASSERT(data); + data->conn = this; #if USE_OUTSIDE_DISPATCH callDeliveryMutex.lock(); callDeliveryState = data; |