Two KFilePreviewGenerator's operating on the same KDirModel can lead to infinite...

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

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index ae120777ad12b2a2d51662510bee1ac1be1029e5..cfe447e37c4042cfaff22db233d1f1c7c4db39ac 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -1360,11 +1360,15 @@ void DolphinView::deleteView()
         }
         view = 0;
 
         }
         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_iconsView = 0;
         m_detailsView = 0;
         m_columnView = 0;
         m_fileItemDelegate = 0;

-        m_previewGenerator = 0;

         m_toolTipManager = 0;
     }
 }
         m_toolTipManager = 0;
     }
 }