From 8a51f70377a5133984426b3fa999aee3859cfa5e Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Thu, 24 Jul 2008 19:50:40 +0000 Subject: fix crash when opening a lot of columns and going back very fast by clicking on each breadcrumb of the URL navigator BUG: 164304 svn path=/trunk/KDE/kdebase/apps/; revision=837486 --- src/dolphincolumnview.cpp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'src/dolphincolumnview.cpp') diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp index 957b2064f..6d4801aea 100644 --- a/src/dolphincolumnview.cpp +++ b/src/dolphincolumnview.cpp @@ -190,7 +190,7 @@ void DolphinColumnView::showColumn(const KUrl& url) QList::iterator start = m_columns.begin() + columnIndex; QList::iterator end = m_columns.end(); for (QList::iterator it = start; it != end; ++it) { - (*it)->deleteLater(); + deleteColumn(*it); } m_columns.erase(start, end); @@ -594,7 +594,7 @@ void DolphinColumnView::removeAllColumns() QList::iterator start = m_columns.begin() + 1; QList::iterator end = m_columns.end(); for (QList::iterator it = start; it != end; ++it) { - (*it)->deleteLater(); + deleteColumn(*it); } m_columns.erase(start, end); m_index = 0; @@ -608,4 +608,15 @@ QPoint DolphinColumnView::columnPosition(DolphinColumnWidget* column, const QPoi return QPoint(point.x() - topLeft.x(), point.y() - topLeft.y()); } +void DolphinColumnView::deleteColumn(DolphinColumnWidget* column) +{ + if (column != 0) { + if (m_controller->itemView() == column) { + m_controller->setItemView(0); + } + column->disconnect(); + column->deleteLater(); + } +} + #include "dolphincolumnview.moc" -- cgit v1.3