QgsAttributeTableView::setModel(): fix crash when called with nullptr…

…, such as QgsBrowser::setLayer() does (#15006)
qgis · Jun 12, 2016 · 6b80170ce52e8743d1411fc3cef0b0329a4cce48 · 6b80170
1 parent ffaf493
commit 6b80170ce52e8743d1411fc3cef0b0329a4cce48
Unified Split

Showing with 5 additions and 4 deletions.

+5 −4 src/gui/attributetable/qgsattributetableview.cpp
diff --git a/src/gui/attributetable/qgsattributetableview.cpp b/src/gui/attributetable/qgsattributetableview.cpp
@@ -142,11 +142,12 @@ void QgsAttributeTableView::setModel( QgsAttributeTableFilterModel* filterModel
     mTableDelegate->setFeatureSelectionModel( mFeatureSelectionModel );
     connect( mFeatureSelectionModel, SIGNAL( requestRepaint( QModelIndexList ) ), this, SLOT( repaintRequested( QModelIndexList ) ) );
     connect( mFeatureSelectionModel, SIGNAL( requestRepaint() ), this, SLOT( repaintRequested() ) );
-  }
 
-  mActionWidget = createActionWidget( 0 );
-  mActionWidget->setVisible( false );
-  updateActionImage( mActionWidget );
+    delete mActionWidget;
+    mActionWidget = createActionWidget( 0 );
+    mActionWidget->setVisible( false );
+    updateActionImage( mActionWidget );
+  }
 }
 
 void QgsAttributeTableView::setFeatureSelectionManager( QgsIFeatureSelectionManager* featureSelectionManager )