diff options
| author | Jian Liang <jianliang79@gmail.com> | 2012-02-29 01:04:34 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-29 11:24:00 (GMT) |
| commit | 99a30ca4ce33c40ba5a469a6f47f5905108381f4 (patch) | |
| tree | f47bb6a399914d7f6d47a81e175f97cd0d527d93 /src/activeqt | |
| parent | 78faf96e5fd4bf6c1f37aa7f89229fa9bf3dd70d (diff) | |
| download | Qt-99a30ca4ce33c40ba5a469a6f47f5905108381f4.zip Qt-99a30ca4ce33c40ba5a469a6f47f5905108381f4.tar.gz Qt-99a30ca4ce33c40ba5a469a6f47f5905108381f4.tar.bz2 | |
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>
Diffstat (limited to 'src/activeqt')
| -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 a11ac7a..9dd3689 100644 --- a/src/activeqt/container/qaxwidget.cpp +++ b/src/activeqt/container/qaxwidget.cpp @@ -663,8 +663,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(); |