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
This commit is contained in:
Peter Penz 2010-08-19 15:55:02 +00:00
parent 0490d12e09
commit 97b84c2c53

View file

@ -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"