summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2010-06-06 18:31:27 +0200
committerAndrea Diamantini <adjam7@gmail.com>2010-06-06 18:31:27 +0200
commitd9b2a7f2468dd675d492db32e4d683c2a3dcd842 (patch)
tree09f82a8fb5c3f5f6b68c0ff7ee4ef0149663788c /src
parentPerformance improvement on startup (diff)
downloadrekonq-d9b2a7f2468dd675d492db32e4d683c2a3dcd842.tar.xz
Stupid me! Showing error page in mainFrame() instead of the frame originating
the error request... This should fix bug 217521 CCBUG: 217521
Diffstat (limited to 'src')
-rw-r--r--src/webpage.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/webpage.cpp b/src/webpage.cpp
index c859b5c9..32b785b4 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -521,7 +521,7 @@ void WebPage::manageNetworkErrors(QNetworkReply *reply)
break;
case QNetworkReply::UnknownNetworkError: // unknown network-related error detected
- _protHandler.postHandling(reply->request(), mainFrame());
+ _protHandler.postHandling(reply->request(), frame);
return;
case QNetworkReply::ConnectionRefusedError: // remote server refused connection
@@ -536,10 +536,13 @@ void WebPage::manageNetworkErrors(QNetworkReply *reply)
kDebug() << "ERROR " << reply->error() << ": " << reply->errorString();
if (reply->url() == _loadingUrl)
{
- mainFrame()->setHtml(errorPage(reply));
+ frame->setHtml(errorPage(reply));
+ if(isMainFrameRequest)
+ {
_isOnRekonqPage = true;
Application::instance()->mainWindow()->mainView()->urlBar()->setQUrl(_loadingUrl);
Application::instance()->mainWindow()->updateActions();
+ }
}
break;