summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJian Liang <jianliang79@gmail.com>2012-02-29 09:04:34 +0800
committerQt by Nokia <qt-info@nokia.com>2012-02-29 12:24:00 +0100
commit99a30ca4ce33c40ba5a469a6f47f5905108381f4 (patch)
treef47bb6a399914d7f6d47a81e175f97cd0d527d93
parent78faf96e5fd4bf6c1f37aa7f89229fa9bf3dd70d (diff)
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>
-rw-r--r--src/activeqt/container/qaxwidget.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/activeqt/container/qaxwidget.cpp b/src/activeqt/container/qaxwidget.cpp
index a11ac7a61b..9dd3689f25 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();