From 5e7cf7987f41a1d6c52651d678082d9f9704048e Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Fri, 10 Oct 2008 15:47:47 -0500 Subject: [PATCH] mshtml: Don't crash in UIActivate if hostui is NULL. --- dlls/mshtml/view.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index 4c0d0c525e9..bba0f230290 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -605,11 +605,13 @@ static HRESULT WINAPI OleDocumentView_UIActivate(IOleDocumentView *iface, BOOL f return hres; } - hres = IDocHostUIHandler_ShowUI(This->hostui, - This->usermode == EDITMODE ? DOCHOSTUITYPE_AUTHOR : DOCHOSTUITYPE_BROWSE, - ACTOBJ(This), CMDTARGET(This), This->frame, This->ip_window); - if(FAILED(hres)) - IDocHostUIHandler_HideUI(This->hostui); + if(This->hostui) { + hres = IDocHostUIHandler_ShowUI(This->hostui, + This->usermode == EDITMODE ? DOCHOSTUITYPE_AUTHOR : DOCHOSTUITYPE_BROWSE, + ACTOBJ(This), CMDTARGET(This), This->frame, This->ip_window); + if(FAILED(hres)) + IDocHostUIHandler_HideUI(This->hostui); + } if(This->ip_window) call_set_active_object(This->ip_window, ACTOBJ(This));