Jacek Caban : mshtml: Fixed OnStopBinding if it' s called called after we aborted document binding.

Alexandre Julliard julliard at winehq.org
Fri Oct 7 15:09:14 CDT 2016


Module: wine
Branch: stable
Commit: 9a82df1863dbb366446d299e029c670623c76b31
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9a82df1863dbb366446d299e029c670623c76b31

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Fri May 27 13:43:32 2016 +0200

mshtml: Fixed OnStopBinding if it's called called after we aborted document binding.

Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit b0c759a3b91e2c7b5934b18f0faaecdcc6254bf7)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>

---

 dlls/mshtml/navigate.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c
index ed61ab0..38220ac 100644
--- a/dlls/mshtml/navigate.c
+++ b/dlls/mshtml/navigate.c
@@ -1388,10 +1388,10 @@ static HRESULT nsChannelBSC_stop_binding(BSCallback *bsc, HRESULT result)
 {
     nsChannelBSC *This = nsChannelBSC_from_BSCallback(bsc);
 
-    if(result != E_ABORT) {
+    if(result != E_ABORT && This->is_doc_channel && This->bsc.window) {
         if(FAILED(result))
             handle_navigation_error(This, result);
-        else if(This->is_doc_channel && This->nschannel) {
+        else if(This->nschannel) {
             result = async_stop_request(This);
             if(SUCCEEDED(result))
                 return S_OK;




More information about the wine-cvs mailing list