From 8767b92a1027283562d33de783f9601f66f3d32f Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Fri, 7 Jun 2013 01:10:36 +0200 Subject: Fix behavior on unloaded sites - show url - reload with f5 BUG:319924 BUG:312928 --- src/urlbar/urlbar.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/urlbar') 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); -- cgit v1.2.1