Fix crash when closing docked attribute table

Fix #14909 Fix #15018 git bisect is your friend
qgis · Jun 14, 2016 · a05b2ad · a05b2ad · nirvn · Jun 14, 2016
1 parent df6d2c6
commit a05b2ad
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/src/gui/attributetable/qgsattributetableview.cpp b/src/gui/attributetable/qgsattributetableview.cpp
@@ -139,10 +139,9 @@ void QgsAttributeTableView::setModel( QgsAttributeTableFilterModel* filterModel
     connect( mFeatureSelectionModel, SIGNAL( requestRepaint( QModelIndexList ) ), this, SLOT( repaintRequested( QModelIndexList ) ) );
     connect( mFeatureSelectionModel, SIGNAL( requestRepaint() ), this, SLOT( repaintRequested() ) );
 
-    delete mActionWidget;
-    mActionWidget = createActionWidget( 0 );
+    mActionWidget.reset( createActionWidget( 0 ) );
     mActionWidget->setVisible( false );
-    updateActionImage( mActionWidget );
+    updateActionImage( mActionWidget.data() );
   }
 }
 
@@ -167,13 +166,13 @@ QWidget* QgsAttributeTableView::createActionWidget( QgsFeatureId fid )
 
   if ( attributeTableConfig.actionWidgetStyle() == QgsAttributeTableConfig::DropDown )
   {
-    toolButton  = new QToolButton( this );
+    toolButton  = new QToolButton();
     toolButton->setPopupMode( QToolButton::MenuButtonPopup );
     container = toolButton;
   }
   else
   {
-    container = new QWidget( this );
+    container = new QWidget();
     container->setLayout( new QHBoxLayout() );
     container->layout()->setMargin( 0 );
   }
@@ -400,7 +399,7 @@ void QgsAttributeTableView::columnSizeChanged( int index, int oldWidth, int newW
   if ( mFilterModel->actionColumnIndex() == index )
   {
     mActionWidget->resize( newWidth, mActionWidget->height() );
-    updateActionImage( mActionWidget );
+    updateActionImage( mActionWidget.data() );
   }
   emit columnResized( index, newWidth );
 }

diff --git a/src/gui/attributetable/qgsattributetableview.h b/src/gui/attributetable/qgsattributetableview.h
@@ -170,7 +170,7 @@ class GUI_EXPORT QgsAttributeTableView : public QTableView
     QMenu *mActionPopup;
     int mRowSectionAnchor;
     QItemSelectionModel::SelectionFlag mCtrlDragSelectionFlag;
-    QWidget* mActionWidget;
+    QScopedPointer<QWidget> mActionWidget;
 };
 
 #endif