Merge pull request #6626 from alexispolti/fix_georeferencer_crash_18227

m-kuhn · web-flow · commit 11741ad460d2 · 2018-04-24T08:17:55.000+02:00
[bugfix] Fix georeferencer crash when deleting a point through context menu #18227
diff --git a/src/plugins/georeferencer/qgsgcplistwidget.cpp b/src/plugins/georeferencer/qgsgcplistwidget.cpp
@@ -194,10 +194,6 @@ void QgsGCPListWidget::showContextMenu( QPoint p )
   connect( removeAction, &QAction::triggered, this, &QgsGCPListWidget::removeRow );
   m.addAction( removeAction );
   m.exec( QCursor::pos(), removeAction );
-
-  index = static_cast<const QSortFilterProxyModel *>( model() )->mapToSource( index );
-  mPrevRow = index.row();
-  mPrevColumn = index.column();
 }
 
 void QgsGCPListWidget::removeRow()
@@ -214,6 +210,8 @@ void QgsGCPListWidget::editCell()
 void QgsGCPListWidget::jumpToPoint()
 {
   QModelIndex index = static_cast<const QSortFilterProxyModel *>( model() )->mapToSource( currentIndex() );
+  mPrevRow = index.row();
+  mPrevColumn = index.column();
   emit jumpToGCP( index.row() );
 }
 

Original file line number	Diff line number	Diff line change
`@@ -194,10 +194,6 @@ void QgsGCPListWidget::showContextMenu( QPoint p )`
`194`	`194`	`connect( removeAction, &QAction::triggered, this, &QgsGCPListWidget::removeRow );`
`195`	`195`	`m.addAction( removeAction );`
`196`	`196`	`m.exec( QCursor::pos(), removeAction );`
`197`		`-`
`198`		`- index = static_cast<const QSortFilterProxyModel *>( model() )->mapToSource( index );`
`199`		`- mPrevRow = index.row();`
`200`		`- mPrevColumn = index.column();`
`201`	`197`	`}`
`202`	`198`
`203`	`199`	`void QgsGCPListWidget::removeRow()`
`@@ -214,6 +210,8 @@ void QgsGCPListWidget::editCell()`
`214`	`210`	`void QgsGCPListWidget::jumpToPoint()`
`215`	`211`	`{`
`216`	`212`	`QModelIndex index = static_cast<const QSortFilterProxyModel *>( model() )->mapToSource( currentIndex() );`
	`213`	`+ mPrevRow = index.row();`
	`214`	`+ mPrevColumn = index.column();`
`217`	`215`	`emit jumpToGCP( index.row() );`
`218`	`216`	`}`
`219`	`217`