From 18bb10373aa06d258763a1f75e53acb397269ce4 Mon Sep 17 00:00:00 2001 From: David Faure Date: Fri, 1 Oct 2021 11:25:24 +0200 Subject: [PATCH] QAbstractItemView: fix crash if setData() does a model reset Task-number: QTBUG-96654 Pick-to: 6.2 Change-Id: I2dca4af387ef5ad549a1a41fba2bc6de217f4ea9 Reviewed-by: Lars Knoll --- src/widgets/itemviews/qabstractitemview.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/widgets/itemviews/qabstractitemview.cpp b/src/widgets/itemviews/qabstractitemview.cpp index 67f24f071d..0e399e1360 100644 --- a/src/widgets/itemviews/qabstractitemview.cpp +++ b/src/widgets/itemviews/qabstractitemview.cpp @@ -2755,16 +2755,23 @@ bool QAbstractItemView::edit(const QModelIndex &index, EditTrigger trigger, QEve d->delayedEditing.stop(); } + // in case e.g. setData() triggers a reset() + QPersistentModelIndex safeIndex(index); + if (d->sendDelegateEvent(index, event)) { - update(index); + update(safeIndex); return true; } + if (!safeIndex.isValid()) { + return false; + } + // save the previous trigger before updating EditTriggers lastTrigger = d->lastTrigger; d->lastTrigger = trigger; - if (!d->shouldEdit(trigger, d->model->buddy(index))) + if (!d->shouldEdit(trigger, d->model->buddy(safeIndex))) return false; if (d->delayedEditing.isActive()) @@ -2779,7 +2786,7 @@ bool QAbstractItemView::edit(const QModelIndex &index, EditTrigger trigger, QEve if (trigger == SelectedClicked) d->delayedEditing.start(QApplication::doubleClickInterval(), this); else - d->openEditor(index, d->shouldForwardEvent(trigger, event) ? event : nullptr); + d->openEditor(safeIndex, d->shouldForwardEvent(trigger, event) ? event : nullptr); return true; }