Fix crash in attribute table when action column is visible and edit is

toggled (cherry-picked from 3d8dd49)
qgis · Apr 2, 2018 · 5f1d3db · 5f1d3db
1 parent 1d102b2
commit 5f1d3db
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/src/gui/attributetable/qgsattributetableview.cpp b/src/gui/attributetable/qgsattributetableview.cpp
@@ -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();
 }