diff options
Diffstat (limited to 'src/application.cpp')
| -rw-r--r-- | src/application.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/application.cpp b/src/application.cpp index 6684439c..e93e5b8e 100644 --- a/src/application.cpp +++ b/src/application.cpp @@ -285,15 +285,7 @@ void Application::loadUrl(const KUrl& url, const Rekonq::OpenType& type) } WebView *view = createView(type); - - loadingUrl = resolvUrl( loadingUrl.pathOrUrl() ); - - // we are sure of the url now, let's add it to history - // anyway we store here just http sites because local and ftp ones are - // added trough the protocol handler and the other are ignored - if( url.protocol() == QLatin1String("http") || url.protocol() == QLatin1String("https") ) - historyManager()->addHistoryEntry( loadingUrl.prettyUrl() ); - + // if (!ReKonfig::openTabsBack()) // { // w->mainView()->urlBar()->setUrl(loadingUrl.prettyUrl()); @@ -301,6 +293,14 @@ void Application::loadUrl(const KUrl& url, const Rekonq::OpenType& type) if (view) { + loadingUrl = resolvUrl( loadingUrl.pathOrUrl() ); + + // we are sure of the url now, let's add it to history + // anyway we store here just http sites because local and ftp ones are + // added trough the protocol handler and the other are ignored + if( url.protocol() == QLatin1String("http") || url.protocol() == QLatin1String("https") ) + historyManager()->addHistoryEntry( loadingUrl.prettyUrl() ); + view->setFocus(); view->load(loadingUrl); } |