[PATCH v3 1/3] mshtml: Don't query for an INewWindowManager if the client site is NULL.

[Zebediah Figura]

Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
---
 dlls/mshtml/navigate.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c
index 423d650a8c..1597de9a0c 100644
--- a/dlls/mshtml/navigate.c
+++ b/dlls/mshtml/navigate.c
@@ -2246,9 +2246,14 @@ HRESULT navigate_new_window(HTMLOuterWindow *window, IUri *uri, const WCHAR *nam
     nsChannelBSC *bsc;
     HRESULT hres;
 
-    hres = do_query_service((IUnknown*)window->doc_obj->client, &SID_SNewWindowManager, &IID_INewWindowManager,
-            (void**)&new_window_mgr);
-    if(SUCCEEDED(hres)) {
+    if (window->doc_obj->client) {
+        hres = do_query_service((IUnknown*)window->doc_obj->client, &SID_SNewWindowManager,
+                                &IID_INewWindowManager, (void**)&new_window_mgr);
+        if (FAILED(hres)) {
+            FIXME("No INewWindowManager\n");
+            return hres;
+        }
+
         hres = IUri_GetDisplayUri(window->uri_nofrag, &context_url);
         if(FAILED(hres))
             return hres;
@@ -2270,9 +2275,6 @@ HRESULT navigate_new_window(HTMLOuterWindow *window, IUri *uri, const WCHAR *nam
                 *ret = NULL;
             return S_OK;
         }
-    }else {
-        FIXME("No INewWindowManager\n");
-        return E_NOTIMPL;
     }
 
 
-- 
2.14.1