mshtml: Don't crash in UIActivate if hostui is NULL.

5e7cf798 · Jacek Caban · Alexandre Julliard · 8db98e9e · 5e7cf798
Commit 5e7cf798 authored Oct 10, 2008 by Jacek Caban Committed by Alexandre Julliard Oct 13, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 5 deletions

view.c dlls/mshtml/view.c +7 -5

No files found.
--- 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));