Forward port of SVN commit 1147596: Skip redirection URLs when going back or forward...

[dolphin.git] / src / dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index fa68415387daa5b50a34ec8b882a0aefc51117d6..28ffc23e45dd4c5d2eaee8a8d5e526470b15c109 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -433,7 +433,13 @@ void DolphinViewContainer::redirect(const KUrl& oldUrl, const KUrl& newUrl)
     Q_UNUSED(oldUrl);
     const bool block = m_urlNavigator->signalsBlocked();
     m_urlNavigator->blockSignals(true);
+    
+    // Assure that the location state is reset for redirection URLs. This
+    // allows to skip redirection URLs when going back or forward in the
+    // URL history.
+    m_urlNavigator->saveLocationState(QByteArray());
     m_urlNavigator->setLocationUrl(newUrl);
+    
     m_urlNavigator->blockSignals(block);
 }