From: Peter Penz <peter.penz19@gmail.com>
Date: Mon, 24 Sep 2007 17:18:53 +0000 (+0000)
Subject: temporary fix: prevent crash due to a wrong root URL; TODO: fix the real root cause... 
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/4832bd7fbde4bae828fb5cd667eb129d1ce78af7?ds=sidebyside

temporary fix: prevent crash due to a wrong root URL; TODO: fix the real root cause of this crash

svn path=/trunk/KDE/kdebase/apps/; revision=716416
---

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index ab413f765..69d7706d3 100644
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -423,15 +423,20 @@ void DolphinView::setUrl(const KUrl& 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);
-        startDirLister(m_rootUrl);
-        Q_ASSERT(itemView() == m_columnView);
-        m_columnView->showColumn(url);
-    } else {
+        if (itemView() == m_columnView) {
+            startDirLister(m_rootUrl);
+            m_columnView->showColumn(url);
+            useUrlProperties = false;
+        }
+    }
+
+    if (useUrlProperties) {
         applyViewProperties(url);
         startDirLister(url);
     }