From: Peter Penz <peter.penz19@gmail.com>
Date: Fri, 21 Sep 2007 19:21:24 +0000 (+0000)
Subject: Don't invoke KDirLister::openUrl(url, true, false) in combination with the column... 
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/717823ffefa4abe4ba252700212ce1ea06193684

Don't invoke KDirLister::openUrl(url, true, false) in combination with the column view, otherwise an assertion in KDirModel is triggered which indicates that KDirModel::expandToUrl() should be used. But in this case invoking expandToUrl() is not needed at all...

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

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index d7e79f330..0b6c32811 100644
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -525,9 +525,8 @@ 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.
-                keepOldDirs = false;
+                m_dirLister->openUrl(url, false, false);
             }
-            m_dirLister->openUrl(url, keepOldDirs, false);
         }
     } else {
         m_dirLister->openUrl(url, false, reload);