From 5b5f0c9d7e5887e39b9dcf080899ca52de4e973f Mon Sep 17 00:00:00 2001 From: Simon Paul St James Date: Wed, 21 Jan 2009 19:43:41 +0000 Subject: [PATCH] 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 --- src/dolphinview.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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; } } -- 2.47.3