From d96a3338ba21a746602e160c238e0ae16dc3bbb5 Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Mon, 24 Sep 2007 06:55:50 +0000 Subject: [PATCH] don't delete inactive columns when reloading the column-view svn path=/trunk/KDE/kdebase/apps/; revision=716190 --- src/dolphincolumnview.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp index 154adeaca..9f7eddefb 100644 --- a/src/dolphincolumnview.cpp +++ b/src/dolphincolumnview.cpp @@ -471,8 +471,6 @@ void DolphinColumnView::setModel(QAbstractItemModel* model) void DolphinColumnView::reload() { - deleteInactiveChildColumns(); - // Due to the reloading of the model all columns will be reset to show // the same content as the first column. As this is not wanted, all columns // except of the first column are temporary hidden until the root index can @@ -706,7 +704,9 @@ void DolphinColumnView::updateDecorationSize() void DolphinColumnView::expandToActiveUrl() { - const KUrl& activeUrl = m_controller->url(); + const int lastIndex = m_columns.count() - 1; + Q_ASSERT(lastIndex >= 0); + const KUrl& activeUrl = m_columns[lastIndex]->url(); const KUrl baseUrl = m_dolphinModel->dirLister()->url(); if (baseUrl.isParentOf(activeUrl) && (baseUrl != activeUrl)) { m_dolphinModel->expandToUrl(activeUrl); -- 2.47.3