From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Sat, 3 Jul 2010 02:37:52 +0000 (+0000)
Subject: * Ignore invalid redirection after renaming an expanded folder in detail view.
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/873bcbc7b7bffa20c0de588ee5bde7dcbb717235

* Ignore invalid redirection after renaming an expanded folder in detail view.


svn path=/trunk/KDE/kdebase/apps/; revision=1145456
---

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index cda384da4..e73766d24 100644
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -1546,8 +1546,10 @@ KDirLister* DolphinView::ViewAccessor::dirLister() const
 
 void DolphinView::slotRedirection(const KUrl& oldUrl, const KUrl& newUrl)
 {
-    emit redirection(oldUrl, newUrl);
-    m_viewModeController->redirectToUrl(newUrl); // #186947
+    if (oldUrl.equals(url(), KUrl::CompareWithoutTrailingSlash)) {
+        emit redirection(oldUrl, newUrl);
+        m_controller->redirectToUrl(newUrl); // #186947
+    }
 }
 
 void DolphinView::restoreContentsPosition()