From 1436a1f21aad7de66df9bb18fa849dfd192d48fb Mon Sep 17 00:00:00 2001
From: nowrep <nowrep@gmail.com>
Date: Fri, 13 Jan 2012 21:04:40 +0100
Subject: [PATCH] Don't show error page when there are some data received. See
 #155 - should fix this issue

---
 src/webview/webpage.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/webview/webpage.cpp b/src/webview/webpage.cpp
index 15a990075..44aafef25 100644
--- a/src/webview/webpage.cpp
+++ b/src/webview/webpage.cpp
@@ -304,6 +304,11 @@ bool WebPage::extension(Extension extension, const ExtensionOption* option, Exte
 
     const ErrorPageExtensionOption* exOption = static_cast<const QWebPage::ErrorPageExtensionOption*>(option);
     ErrorPageExtensionReturn* exReturn = static_cast<QWebPage::ErrorPageExtensionReturn*>(output);
+    WebPage* erPage = qobject_cast<WebPage*>(exOption->frame->page());
+
+    if (erPage->bytesReceived() != 0) {
+        return QWebPage::extension(extension, option, output);
+    }
 
     QString errorString;
     if (exOption->domain == QWebPage::QtNetwork) {
@@ -325,8 +330,8 @@ bool WebPage::extension(Extension extension, const ExtensionOption* option, Exte
             break;
         case QNetworkReply::ContentAccessDenied:
             if (exOption->errorString.startsWith("AdBlockRule")) {
-                if (exOption->frame != exOption->frame->page()->mainFrame()) { //Content in <iframe>
-                    QWebElement docElement = exOption->frame->page()->mainFrame()->documentElement();
+                if (exOption->frame != erPage->mainFrame()) { //Content in <iframe>
+                    QWebElement docElement = erPage->mainFrame()->documentElement();
 
                     QWebElementCollection elements;
                     elements.append(docElement.findAll("iframe"));