X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/4832bd7fbde4bae828fb5cd667eb129d1ce78af7..6fd52b51ac3bd97483988df222da35f53dfc0305:/src/dolphinview.cpp

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 69d7706d3..9541f5abb 100644
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -420,23 +420,20 @@ 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
 
-    bool useUrlProperties = true;
-    const bool restoreColumnView = !isColumnViewActive()
-                                   && m_rootUrl.isParentOf(url)
-                                   && (m_rootUrl != url);
     if (restoreColumnView) {
         applyViewProperties(m_rootUrl);
-        if (itemView() == m_columnView) {
-            startDirLister(m_rootUrl);
-            m_columnView->showColumn(url);
-            useUrlProperties = false;
-        }
-    }
-
-    if (useUrlProperties) {
+        Q_ASSERT(itemView() == m_columnView);
+        startDirLister(m_rootUrl);
+        m_columnView->showColumn(url);
+    } else {
         applyViewProperties(url);
         startDirLister(url);
     }