Restoring the column view relies on the URL-history. It might be possible that the...

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

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index eae699a7bef42595db12c4fbae5e96c133f45434..94ed99b690b50939d012a16b871c615e2c9f3ff1 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -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);