From 6a7cb5ff7d29cc636b432a96e0db9ef9f9030527 Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Mon, 30 Apr 2012 18:54:12 +0200 Subject: Fix crash when closing Dolphin during generating previews BUG: 299108 FIXED-IN: 4.9.0 --- src/kitemviews/kitemlistview.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/kitemviews/kitemlistview.cpp') diff --git a/src/kitemviews/kitemlistview.cpp b/src/kitemviews/kitemlistview.cpp index 8ecd1e212..48849a3c1 100644 --- a/src/kitemviews/kitemlistview.cpp +++ b/src/kitemviews/kitemlistview.cpp @@ -761,13 +761,8 @@ void KItemListView::onControllerChanged(KItemListController* current, KItemListC void KItemListView::onModelChanged(KItemModelBase* current, KItemModelBase* previous) { + Q_UNUSED(current); Q_UNUSED(previous); - - m_sizeHintResolver->clearCache(); - const int itemCount = current->count(); - if (itemCount > 0) { - m_sizeHintResolver->itemsInserted(0, itemCount); - } } void KItemListView::onScrollOrientationChanged(Qt::Orientation current, Qt::Orientation previous) @@ -1446,6 +1441,8 @@ void KItemListView::setModel(KItemModelBase* model) this, SLOT(slotSortRoleChanged(QByteArray,QByteArray))); } + m_sizeHintResolver->clearCache(); + m_model = model; m_layouter->setModel(model); m_grouped = model->groupedSorting(); @@ -1468,6 +1465,7 @@ void KItemListView::setModel(KItemModelBase* model) const int itemCount = m_model->count(); if (itemCount > 0) { + m_sizeHintResolver->itemsInserted(0, itemCount); slotItemsInserted(KItemRangeList() << KItemRange(0, itemCount)); } } -- cgit v1.3