Oops forgot this one... thanks for reminding Peter :)

[dolphin.git] / src / dolphinview.cpp

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 6a6c40c7bb23cc07753cdab7696b5ec6523b53e5..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);
@@ -573,11 +577,11 @@ void DolphinView::startDirLister(const KUrl& url, bool reload)
                 // The current URL is not a child of the dir lister
                 // URL. This may happen when e. g. a place has been selected
                 // and hence the view must be reset.
-                m_dirLister->openUrl(url, false, false);
+                m_dirLister->openUrl(url, KDirLister::NoFlags);
             }
         }
     } else {
-        m_dirLister->openUrl(url, false, reload);
+        m_dirLister->openUrl(url, reload ? KDirLister::Reload : KDirLister::NoFlags);
     }
 }