summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael BrĂ¼ning <michael.bruning@digia.com>2014-10-10 17:38:33 +0200
committerMichael Bruning <michael.bruning@digia.com>2014-10-10 18:10:12 +0200
commitd44b90f9fd7efada0153fbdb0433454e63167b82 (patch)
treea843d5641f8499c7cb987632d70925abe8f78d33
parent739bfbb55df666c7fb975fb847bbd3f129b88eba (diff)
Do not run Callback for already canceled URLRequests.v5.4.0-beta1
Doing so causes a check to fail in URLRequest::BeforeRequestComplete. Change-Id: I487042b922b3f357bd8d9579167d9b372963ff29 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
-rw-r--r--src/core/network_delegate_qt.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/network_delegate_qt.cpp b/src/core/network_delegate_qt.cpp
index 81ab4b6b..f14d2cb3 100644
--- a/src/core/network_delegate_qt.cpp
+++ b/src/core/network_delegate_qt.cpp
@@ -130,6 +130,9 @@ void NetworkDelegateQt::CompleteURLRequestOnIOThread(net::URLRequest *request,
if (!m_activeRequests.contains(request))
return;
+ if (request->status().status() == net::URLRequestStatus::CANCELED)
+ return;
+
int error = net::OK;
switch (navigationRequestAction) {
case WebContentsAdapterClient::AcceptRequest: