summaryrefslogtreecommitdiff
path: root/src/urlbar
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2013-06-07 01:10:36 +0200
committerAndrea Diamantini <adjam7@gmail.com>2013-06-07 01:10:36 +0200
commit8767b92a1027283562d33de783f9601f66f3d32f (patch)
treeaee519f5bbae9fe0c4b8fe6ff37183dd28ba8bb4 /src/urlbar
parentMove from about: to rekonq: protocol for our special links (diff)
downloadrekonq-8767b92a1027283562d33de783f9601f66f3d32f.tar.xz
Fix behavior on unloaded sites
- show url - reload with f5 BUG:319924 BUG:312928
Diffstat (limited to 'src/urlbar')
-rw-r--r--src/urlbar/urlbar.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index 0c582c42..e12c5842 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -179,6 +179,10 @@ void UrlBar::setQUrl(const QUrl& url)
if (url.scheme() == QL1S("rekonq"))
return;
+ // we don't set empty url
+ if (url.isEmpty())
+ return;
+
clearFocus();
// Workaround for KLineEdit bug: incorrectly displaying
@@ -187,6 +191,7 @@ void UrlBar::setQUrl(const QUrl& url)
const QString humanReadableUrl = QString::fromUtf8(
QByteArray::fromPercentEncoding(urlTextData).constData()
);
+
// End workaround
setText(humanReadableUrl);
@@ -204,6 +209,7 @@ void UrlBar::loadRequestedUrl(const KUrl& url, Rekonq::OpenType type)
const QString humanReadableUrl = QString::fromUtf8(
QByteArray::fromPercentEncoding(urlTextData).constData()
);
+
// End workaround
setText(humanReadableUrl);