From: Peter Penz <peter.penz19@gmail.com>
Date: Fri, 5 Oct 2007 06:33:48 +0000 (+0000)
Subject: Restoring the column view relies on the URL-history. It might be possible that the... 
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/8dc8c5d21fae81979c1010dc9c24c5f4e54b6dbe

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

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index eae699a7b..94ed99b69 100644
--- 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);