From 73e76f9e86b3fded45be6b232bdebe75e7136e4a Mon Sep 17 00:00:00 2001 From: Benjamin Terrier Date: Sat, 22 Jan 2022 02:59:56 +0100 Subject: Use IsSameDocument() rather than IsLoadingToDifferentDocument() For certain types of redirect navigations (for example, with a non-default useragent set) 'IsLoadingToDifferentDocument()' can be unexpectedly false. In such cases 'navigation_handle->IsSameDocument()' also returns false. Fixes: QTBUG-94924 Change-Id: Ie2c17127e1a00ffc515829526320ba2f71d45af5 Reviewed-by: Kirill Burtsev (cherry picked from commit 8b5e3a46f253cd82dc48bc20c4233f1bf79fcb87) Reviewed-by: Qt Cherry-pick Bot --- src/core/web_contents_delegate_qt.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp index d52b07df3..e7bfa6510 100644 --- a/src/core/web_contents_delegate_qt.cpp +++ b/src/core/web_contents_delegate_qt.cpp @@ -354,7 +354,7 @@ void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *naviga if (!webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) navigation_handle->SetSilentlyIgnoreErrors(); - if (!navigation_handle->IsInMainFrame() || !web_contents()->IsLoadingToDifferentDocument()) + if (!navigation_handle->IsInMainFrame() || navigation_handle->IsSameDocument()) return; m_faviconManager->resetCandidates(); -- cgit v1.2.3