assure that the restoring the column view cannot fail and replace the temporary ...

[dolphin.git] / src / dolphinview.cpp

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index ab413f765e9a60796610f5a8644e83b8514ce4c4..9541f5abbe3bfc08bec88ae215e606f42bedfefa 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -420,16 +420,18 @@ void DolphinView::setUrl(const KUrl& url)
         return;
     }
 
+    const bool restoreColumnView = !isColumnViewActive()
+                                    && !m_rootUrl.isEmpty()
+                                    && m_rootUrl.isParentOf(url)
+                                    && (m_rootUrl != url);
+
     const KUrl oldRootUrl = rootUrl();
     m_controller->setUrl(url); // emits urlChanged, which we forward
 
-    const bool restoreColumnView = !isColumnViewActive()
-                                   && m_rootUrl.isParentOf(url)
-                                   && (m_rootUrl != url);
     if (restoreColumnView) {
         applyViewProperties(m_rootUrl);
-        startDirLister(m_rootUrl);
         Q_ASSERT(itemView() == m_columnView);
+        startDirLister(m_rootUrl);
         m_columnView->showColumn(url);
     } else {
         applyViewProperties(url);