Fix wrong behavior (or triggering of an assertion in the debug mode), if "Go Up"...

CCBUG: 248405

svn path=/trunk/KDE/kdebase/apps/; revision=1165550

diff --git a/src/views/dolphincolumnviewcontainer.cpp b/src/views/dolphincolumnviewcontainer.cpp
index 344d38d8a343b186bbe2aebf7e1ba73781fd6140..2054f59844bb58df44810d506d309b800192bac4 100644 (file)
--- a/src/views/dolphincolumnviewcontainer.cpp
+++ b/src/views/dolphincolumnviewcontainer.cpp
@@ -108,7 +108,7 @@ void DolphinColumnViewContainer::showColumn(const KUrl& url)
 
     int columnIndex = 0;
     foreach (DolphinColumnView* column, m_columns) {
-        if (column->url() == url) {
+        if (column->url().equals(url, KUrl::CompareWithoutTrailingSlash)) {
             // the column represents already the requested URL, hence activate it
             requestActivation(column);
             layoutColumns();
@@ -411,6 +411,8 @@ void DolphinColumnViewContainer::deleteColumn(DolphinColumnView* column)
     } else {
         column->deleteLater();
     }
+
+    layoutColumns();
 }
 
 #include "dolphincolumnviewcontainer.moc"