Restoring the column view relies on the URL-history. It might be possible that the view properties have been changed or deleted in the meantime, so it cannot be asserted that really a column view has been created.

svn path=/trunk/KDE/kdebase/apps/; revision=721374
This commit is contained in:
Peter Penz 2007-10-05 06:33:48 +00:00
parent 47f0accc47
commit 8dc8c5d21f

View file

@ -452,9 +452,13 @@ void DolphinView::updateView(const KUrl& url, const KUrl& rootUrl)
if (restoreColumnView) {
applyViewProperties(rootUrl);
Q_ASSERT(itemView() == m_columnView);
startDirLister(rootUrl);
m_columnView->showColumn(url);
// Restoring the column view relies on the URL-history. It might be possible
// that the view properties have been changed or deleted in the meantime, so
// it cannot be asserted that really a column view has been created:
if (itemView() == m_columnView) {
m_columnView->showColumn(url);
}
} else {
applyViewProperties(url);
startDirLister(url);