From 48c1382c33b77b002c1b295b9d2d6c4987526add Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Br=C3=BCning?= Date: Tue, 26 Nov 2013 15:28:58 +0100 Subject: Fix bad if test in QQuickWebViewPrivate::didFailLoad. It was using and for two different error codes as David Binderman pointed out. Task-number: QTBUG-39425 Change-Id: I85348d8ba07757eb33eceb447adb34cc2e4e1842 Reviewed-by: Allan Sandfeld Jensen --- Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/WebKit2/UIProcess') diff --git a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp index 07e606881..31a8d1a54 100644 --- a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp +++ b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp @@ -433,7 +433,7 @@ void QQuickWebViewPrivate::didFailLoad(WKPageRef, WKFrameRef frame, WKErrorRef e } int errorCode = error.errorCode(); - if (errorCode == kWKErrorCodeFrameLoadInterruptedByPolicyChange && errorCode == kWKErrorCodePlugInWillHandleLoad) { + if (errorCode == kWKErrorCodeFrameLoadInterruptedByPolicyChange || errorCode == kWKErrorCodePlugInWillHandleLoad) { QWebLoadRequest loadRequest(q->url(), QQuickWebView::LoadSucceededStatus); q->emitUrlChangeIfNeeded(); emit q->loadingChanged(&loadRequest); -- cgit v1.2.1