diff options
| author | Jian Liang <jianliang79@gmail.com> | 2012-02-29 09:04:34 +0800 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-01 18:00:48 +0100 |
| commit | ec75fa7376a1508fe2b4d7685e23d35838945756 (patch) | |
| tree | 5c2be99025e7982c78269eaf2d0f5371c30f4e06 /src | |
| parent | 79422085297ce5a25dde14a3ca5a7a1b8e8d5ae6 (diff) | |
| download | qtactiveqt-ec75fa7376a1508fe2b4d7685e23d35838945756.tar.gz | |
Make sure we release IAdviseSink interface
IAdviseSink interface is not released if spViewObject is 0 in
QAxClientSite::activateObject(). This patch fix this problem.
Change-Id: I5d215e18468660eab59ef69e6fd71405337264b3
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
(cherry picked from commit 99a30ca4ce33c40ba5a469a6f47f5905108381f4)
Diffstat (limited to 'src')
| -rw-r--r-- | src/activeqt/container/qaxwidget.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/activeqt/container/qaxwidget.cpp b/src/activeqt/container/qaxwidget.cpp index 5419c17..6b2ed5f 100644 --- a/src/activeqt/container/qaxwidget.cpp +++ b/src/activeqt/container/qaxwidget.cpp @@ -678,8 +678,9 @@ bool QAxClientSite::activateObject(bool initialized, const QByteArray &data) if (spAdviseSink && spViewObject) { if (spViewObject) spViewObject->SetAdvise(DVASPECT_CONTENT, 0, spAdviseSink); - spAdviseSink->Release(); } + if (spAdviseSink) + spAdviseSink->Release(); if (spViewObject) spViewObject->Release(); |