diff options
| author | Thiago Macieira <thiago.macieira@trolltech.com> | 2006-04-29 10:07:42 +0000 |
|---|---|---|
| committer | John Palmieri <johnp@remedyz.boston.redhat.com> | 2006-06-28 08:15:15 -0400 |
| commit | b841326b891c15a34bd3d72fd17e001fc1ebd77d (patch) | |
| tree | 678bd6f45fd6f46c49fad3f25e8fb865b274fc69 | |
| parent | 3145132ec231ce2fb28e8607d152594807f2fc83 (diff) | |
* qt/qdbusintegrator.cpp: Fix assertion failure spotted by Brad Hards.
| -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 4dabd43..bef8268 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; |