X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/772a55aafc2e558302d042eb65026b9b50302ccc..6fd52b51ac3bd97483988df222da35f53dfc0305:/src/dolphinview.cpp diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp index ab413f765..9541f5abb 100644 --- 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);