[FIX #7529] Attribute table: Crash when changing column filter

m-kuhn · m-kuhn · commit 663e95d77e8e · 2013-04-08T14:44:09.000+02:00
When using the field calculator and afterwards changing the column filter
resulted in a crash
diff --git a/src/app/qgsattributetabledialog.cpp b/src/app/qgsattributetabledialog.cpp
@@ -110,6 +110,8 @@ QgsAttributeTableDialog::QgsAttributeTableDialog( QgsVectorLayer *theLayer, QWid
   connect( mLayer, SIGNAL( editingStopped() ), this, SLOT( editingToggled() ) );
   connect( mLayer, SIGNAL( layerDeleted() ), this, SLOT( close() ) );
   connect( mLayer, SIGNAL( selectionChanged() ), this, SLOT( updateTitle() ) );
+  connect( mLayer, SIGNAL( attributeAdded(int) ), this, SLOT( columnBoxInit() ) );
+  connect( mLayer, SIGNAL( attributeDeleted(int) ), this, SLOT( columnBoxInit() ) );
 
   // connect table info to window
   connect( mMainView, SIGNAL( filterChanged() ), this, SLOT( updateTitle() ) );
@@ -222,6 +224,7 @@ void QgsAttributeTableDialog::columnBoxInit()
   {
     mFilterColumnsMenu->removeAction( a );
     mFilterActionMapper->removeMappings( a );
+    mFilterButton->removeAction( a );
     delete a;
   }
 
@@ -348,7 +351,6 @@ void QgsAttributeTableDialog::on_mOpenFieldCalculator_clicked()
     if ( col >= 0 )
     {
       masterModel->reload( masterModel->index( 0, col ), masterModel->index( masterModel->rowCount() - 1, col ) );
-      columnBoxInit();
     }
   }
 }
diff --git a/src/app/qgsattributetabledialog.h b/src/app/qgsattributetabledialog.h
@@ -163,12 +163,13 @@ class QgsAttributeTableDialog : public QDialog, private Ui::QgsAttributeTableDia
      */
     void closeEvent( QCloseEvent* event );
 
-  private:
+  private slots:
     /**
      * Initialize column box
      */
     void columnBoxInit();
 
+  private:
     QMenu* mMenuActions;
     QAction* mActionToggleEditing;
 

Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,8 @@ QgsAttributeTableDialog::QgsAttributeTableDialog( QgsVectorLayer *theLayer, QWid`
`110`	`110`	`connect( mLayer, SIGNAL( editingStopped() ), this, SLOT( editingToggled() ) );`
`111`	`111`	`connect( mLayer, SIGNAL( layerDeleted() ), this, SLOT( close() ) );`
`112`	`112`	`connect( mLayer, SIGNAL( selectionChanged() ), this, SLOT( updateTitle() ) );`
	`113`	`+ connect( mLayer, SIGNAL( attributeAdded(int) ), this, SLOT( columnBoxInit() ) );`
	`114`	`+ connect( mLayer, SIGNAL( attributeDeleted(int) ), this, SLOT( columnBoxInit() ) );`
`113`	`115`
`114`	`116`	`// connect table info to window`
`115`	`117`	`connect( mMainView, SIGNAL( filterChanged() ), this, SLOT( updateTitle() ) );`
`@@ -222,6 +224,7 @@ void QgsAttributeTableDialog::columnBoxInit()`
`222`	`224`	`{`
`223`	`225`	`mFilterColumnsMenu->removeAction( a );`
`224`	`226`	`mFilterActionMapper->removeMappings( a );`
	`227`	`+ mFilterButton->removeAction( a );`
`225`	`228`	`delete a;`
`226`	`229`	`}`
`227`	`230`
`@@ -348,7 +351,6 @@ void QgsAttributeTableDialog::on_mOpenFieldCalculator_clicked()`
`348`	`351`	`if ( col >= 0 )`
`349`	`352`	`{`
`350`	`353`	`masterModel->reload( masterModel->index( 0, col ), masterModel->index( masterModel->rowCount() - 1, col ) );`
`351`		`- columnBoxInit();`
`352`	`354`	`}`
`353`	`355`	`}`
`354`	`356`	`}`