Use the new KIO::PreviewJob API

[dolphin.git] / src / views / dolphinview.cpp

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 4ab16e0528a7eb3e4a8ae98c3cc25437c673ad61..db917ee5a3e8b16774d4081bf9cc26017d5637bf 100644 (file)
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -434,9 +434,13 @@ void DolphinView::refresh()
     m_active = true;
 
     createView();
-    applyViewProperties();
     reload();
 
+    // For performance reasons applying the view properties should be done after updating
+    // the directory-lister URL with reload(). Otherwise in combination with enabled
+    // previews the creation of already obsolete directory items gets triggered.
+    applyViewProperties();
+
     setActive(oldActivationState);
     updateZoomLevel(oldZoomLevel);
 }
@@ -544,7 +548,6 @@ void DolphinView::setUrl(const KUrl& url)
 
     m_viewModeController->setUrl(url); // emits urlChanged, which we forward
     m_viewAccessor.prepareUrlChange(url);
-    applyViewProperties();
 
     // When changing the URL there is no need to keep the version
     // data of the previous URL.
@@ -554,6 +557,11 @@ void DolphinView::setUrl(const KUrl& url)
     connectViewAccessor();
     loadDirectory(url);
 
+    // For performance reasons applying the view properties should be done after updating
+    // the directory-lister URL with loadDirectory(). Otherwise in combination with enabled
+    // previews the creation of already obsolete directory items gets triggered.
+    applyViewProperties();
+
     if (hadSelection || hasSelection()) {
         emitSelectionChangedSignal();
     }