Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix crash in attribute table when action column is visible and edit is
toggled
  • Loading branch information
nyalldawson committed Mar 27, 2018
1 parent 1efb3cb commit 3d8dd49
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions src/gui/attributetable/qgsattributetableview.cpp
Expand Up @@ -449,14 +449,13 @@ void QgsAttributeTableView::onActionColumnItemPainted( const QModelIndex &index

void QgsAttributeTableView::recreateActionWidgets()
{
QMap< QModelIndex, QWidget * > newWidgets;
QMap< QModelIndex, QWidget * >::const_iterator it = mActionWidgets.constBegin();
for ( ; it != mActionWidgets.constEnd(); ++it )
{
it.value()->deleteLater(); //?
QWidget *widget = createActionWidget( mFilterModel->data( it.key(), QgsAttributeTableModel::FeatureIdRole ).toLongLong() );
newWidgets.insert( it.key(), widget );
setIndexWidget( it.key(), widget );
// ownership of widget was transferred by initial call to setIndexWidget - clearing
// the index widget will delete the old widget safely
// they should then be recreated by onActionColumnItemPainted
setIndexWidget( it.key(), nullptr );
}
mActionWidgets = newWidgets;
mActionWidgets.clear();
}

0 comments on commit 3d8dd49

Please sign in to comment.