From 4ee19c81bb267daa377ed8bfe778f7c96a60ec58 Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Tue, 23 May 2006 20:06:55 +0200 Subject: [PATCH] shdocvw: Don't do verb that is already done. --- dlls/shdocvw/oleobject.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index c6a35aa457..d9fec8ee08 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -103,14 +103,12 @@ static HRESULT activate_inplace(WebBrowser *This, IOleClientSite *active_site, H { HRESULT hres; + if(This->inplace) + return S_OK; + if(!active_site) return E_INVALIDARG; - if(This->inplace) { - IOleInPlaceSite_Release(This->inplace); - This->inplace = NULL; - } - hres = IOleClientSite_QueryInterface(active_site, &IID_IOleInPlaceSite, (void**)&This->inplace); if(FAILED(hres)) { @@ -158,6 +156,9 @@ static HRESULT activate_ui(WebBrowser *This, IOleClientSite *active_site, HWND p static const WCHAR wszitem[] = {'i','t','e','m',0}; + if(This->inplace) + return S_OK; + hres = activate_inplace(This, active_site, parent_hwnd); if(FAILED(hres)) return hres;