[georef] Fix crash when closing georeferencer window while editing

nyalldawson · nyalldawson · commit 34cbbde21884 · 2015-06-18T19:48:07.000+10:00
GCP list item
diff --git a/src/plugins/georeferencer/qgsgcplistwidget.cpp b/src/plugins/georeferencer/qgsgcplistwidget.cpp
@@ -95,6 +95,14 @@ void QgsGCPListWidget::updateGCPList()
   adjustTableContent();
 }
 
+void QgsGCPListWidget::closeEditors()
+{
+  Q_FOREACH( QModelIndex index, selectedIndexes() )
+  {
+    closePersistentEditor( index );
+  }
+}
+
 void QgsGCPListWidget::itemDoubleClicked( QModelIndex index )
 {
   index = static_cast<const QSortFilterProxyModel*>( model() )->mapToSource( index );
diff --git a/src/plugins/georeferencer/qgsgcplistwidget.h b/src/plugins/georeferencer/qgsgcplistwidget.h
@@ -38,6 +38,7 @@ class QgsGCPListWidget : public QTableView
     void setGeorefTransform( QgsGeorefTransform *theGeorefTransform );
     QgsGCPList *gcpList() { return mGCPList; }
     void updateGCPList();
+    void closeEditors();
 
   public slots:
     // This slot is called by the list view if an item is double-clicked
diff --git a/src/plugins/georeferencer/qgsgeorefplugingui.cpp b/src/plugins/georeferencer/qgsgeorefplugingui.cpp
@@ -2122,6 +2122,10 @@ bool QgsGeorefPluginGui::equalGCPlists( const QgsGCPList &list1, const QgsGCPLis
 
 void QgsGeorefPluginGui::clearGCPData()
 {
+  //force all list widget editors to close before removing data points
+  //otherwise the editors try to update deleted data points when they close
+  mGCPListWidget->closeEditors();
+
   qDeleteAll( mPoints );
   mPoints.clear();
   mGCPListWidget->updateGCPList();

Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,14 @@ void QgsGCPListWidget::updateGCPList()`
`95`	`95`	`adjustTableContent();`
`96`	`96`	`}`
`97`	`97`
	`98`	`+void QgsGCPListWidget::closeEditors()`
	`99`	`+{`
	`100`	`+ Q_FOREACH( QModelIndex index, selectedIndexes() )`
	`101`	`+ {`
	`102`	`+ closePersistentEditor( index );`
	`103`	`+ }`
	`104`	`+}`
	`105`	`+`
`98`	`106`	`void QgsGCPListWidget::itemDoubleClicked( QModelIndex index )`
`99`	`107`	`{`
`100`	`108`	`index = static_cast<const QSortFilterProxyModel*>( model() )->mapToSource( index );`