mshtml: Handle aborts synchronously in nsChannelBSC_stop_binding.

af08c97b · Jacek Caban · Alexandre Julliard · d7a2da57 · af08c97b
Commit af08c97b authored May 13, 2011 by Jacek Caban Committed by Alexandre Julliard May 16, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 6 deletions

navigate.c dlls/mshtml/navigate.c +8 -6

No files found.
--- a/dlls/mshtml/navigate.c
+++ b/dlls/mshtml/navigate.c
@@ -1376,12 +1376,14 @@ static HRESULT nsChannelBSC_stop_binding(BSCallback *bsc, HRESULT result)
 {
    nsChannelBSC *This = nsChannelBSC_from_BSCallback(bsc);

-    if(FAILED(result))
-        handle_navigation_error(This, result);
-    else if(This->window) {
-        result = async_stop_request(This);
-        if(SUCCEEDED(result))
-           return S_OK;
+    if(result != E_ABORT) {
+        if(FAILED(result))
+            handle_navigation_error(This, result);
+        else if(This->window) {
+            result = async_stop_request(This);
+            if(SUCCEEDED(result))
+                return S_OK;
+        }
    }

    on_stop_nsrequest(This, result);