From: Peter Penz <peter.penz19@gmail.com>
Date: Thu, 19 Aug 2010 15:55:02 +0000 (+0000)
Subject: Fix wrong behavior (or triggering of an assertion in the debug mode), if "Go Up"... 
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/97b84c2c53964756694bc7d8b85f21c9cbd82b6c

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

CCBUG: 248405

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

diff --git a/src/views/dolphincolumnviewcontainer.cpp b/src/views/dolphincolumnviewcontainer.cpp
index 344d38d8a..2054f5984 100644
--- 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"