Jacek Caban : mshtml: Skip travellog notifications for frame navigation.
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Nov 13 08:34:47 CST 2015
Module: wine
Branch: master
Commit: 4354bc831fef0f4bdd19d70c691af5e56e7e8c6e
URL: http://source.winehq.org/git/wine.git/?a=commit;h=4354bc831fef0f4bdd19d70c691af5e56e7e8c6e
Author: Jacek Caban <jacek at codeweavers.com>
Date: Fri Nov 13 12:21:21 2015 +0100
mshtml: Skip travellog notifications for frame navigation.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/mshtml/persist.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c
index 20f3191..59ca5e2 100644
--- a/dlls/mshtml/persist.c
+++ b/dlls/mshtml/persist.c
@@ -128,8 +128,12 @@ void set_current_mon(HTMLOuterWindow *This, IMoniker *mon, DWORD flags)
HRESULT hres;
if(This->mon) {
- if(This->doc_obj && !(flags & (BINDING_REPLACE|BINDING_REFRESH)))
- notify_travellog_update(This->doc_obj);
+ if(This->doc_obj && !(flags & (BINDING_REPLACE|BINDING_REFRESH))) {
+ if(This == This->doc_obj->basedoc.window)
+ notify_travellog_update(This->doc_obj);
+ else
+ TRACE("Skipping travellog update for frame navigation.\n");
+ }
IMoniker_Release(This->mon);
This->mon = NULL;
}
More information about the wine-cvs
mailing list