Jacek Caban : mshtml: Handle aborts synchronously in nsChannelBSC_stop_binding.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: af08c97bf98da4d729564ea08260fd9027023b5c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=af08c97bf98da4d729564ea082...

Author: Jacek Caban <jacek(a)codeweavers.com>
Date:   Fri May 13 18:18:12 2011 +0200

mshtml: Handle aborts synchronously in nsChannelBSC_stop_binding.

---

 dlls/mshtml/navigate.c |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c
index bdb95a7..9e45025 100644
--- 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);