fix issue that the view properties are not read out correctly for first directory after starting Dolphin

svn path=/trunk/KDE/kdebase/apps/; revision=653129

2 files changed, 6 insertions, 4 deletions

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 72f0ae4a1..b3148e7d9 100644
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -102,7 +102,7 @@ DolphinView::DolphinView(DolphinMainWindow* mainWindow,
     m_urlNavigator->setUrlEditable(DolphinSettings::instance().generalSettings()->editableUrl());
     m_urlNavigator->setHomeUrl(DolphinSettings::instance().generalSettings()->homeUrl());
     connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)),
-            this, SLOT(loadDirectory(const KUrl&)));
+            this, SLOT(changeDirectory(const KUrl&)));
     connect(m_urlNavigator, SIGNAL(urlsDropped(const KUrl::List&, const KUrl&)),
             this, SLOT(dropUrls(const KUrl::List&, const KUrl&)));
     connect(m_urlNavigator, SIGNAL(activated()),
@@ -607,7 +607,9 @@ void DolphinView::rename(const KUrl& source, const QString& newName)
 
 void DolphinView::reload()
 {
-    startDirLister(m_urlNavigator->url(), true);
+    const KUrl& url = m_urlNavigator->url();
+    changeDirectory(url);
+    startDirLister(url, true);
 }
 
 void DolphinView::mouseReleaseEvent(QMouseEvent* event)
@@ -621,7 +623,7 @@ DolphinMainWindow* DolphinView::mainWindow() const
     return m_mainWindow;
 }
 
-void DolphinView::loadDirectory(const KUrl& url)
+void DolphinView::changeDirectory(const KUrl& url)
 {
     if (!isActive()) {
         requestActivation();
diff --git a/src/dolphinview.h b/src/dolphinview.h
index d60556663..f6b85f96b 100644
--- a/src/dolphinview.h
+++ b/src/dolphinview.h
@@ -429,7 +429,7 @@ protected:
     virtual void mouseReleaseEvent(QMouseEvent* event);
 
 private slots:
-    void loadDirectory(const KUrl& kurl);
+    void changeDirectory(const KUrl& url);
     void triggerItem(const QModelIndex& index);
     void updateProgress(int percent);