From fa72a38050fa1051e14030e06e434b07359a9901 Mon Sep 17 00:00:00 2001 From: nowrep Date: Wed, 27 Jun 2012 20:32:13 +0200 Subject: [PATCH] Fixed showing option what to do with some urls with external protocol. - sometimes, just "?" was shown in dialog instead of actual external url --- src/lib/webview/webpage.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/lib/webview/webpage.cpp b/src/lib/webview/webpage.cpp index a1f3e2255..a87f6ce1b 100644 --- a/src/lib/webview/webpage.cpp +++ b/src/lib/webview/webpage.cpp @@ -628,10 +628,12 @@ bool WebPage::extension(Extension extension, const ExtensionOption* option, Exte case QNetworkReply::UnknownNetworkError: errorString = exOption->errorString.isEmpty() ? tr("Unknown network error") : exOption->errorString; break; - case QNetworkReply::ProtocolUnknownError: - handleUnknownProtocol(exOption->url); + case QNetworkReply::ProtocolUnknownError: { + // Sometimes exOption->url returns just "?" instead of actual url + const QUrl unknownProtocolUrl = (exOption->url == QUrl("?")) ? erPage->mainFrame()->requestedUrl() : exOption->url; + handleUnknownProtocol(unknownProtocolUrl); return false; - break; + } case QNetworkReply::ContentAccessDenied: if (exOption->errorString.startsWith("AdBlock")) { if (exOption->frame != erPage->mainFrame()) { //Content in