Two KFilePreviewGenerator's operating on the same KDirModel can lead to infinite loops of preview generation. If view is not delete'd (e.g. as a result of a FolderExpander), then m_previewGenerator won't be either: delete it manually to prevent having two active at once.

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

1 files changed, 5 insertions, 1 deletions

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index ae120777a..cfe447e37 100644
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -1360,11 +1360,15 @@ void DolphinView::deleteView()
         }
         view = 0;
 
+        // m_previewGenerator's parent is not always destroyed, and we
+        // don't want two active at once - manually delete.
+        delete m_previewGenerator;
+        m_previewGenerator = 0;
+
         m_iconsView = 0;
         m_detailsView = 0;
         m_columnView = 0;
         m_fileItemDelegate = 0;
-        m_previewGenerator = 0;
         m_toolTipManager = 0;
     }
 }