Fix loss of transform context changes when editing project CRS in project properties dialog

nyalldawson · nyalldawson · commit fe50e24ccfca · 2019-03-22T15:38:11.000+10:00
diff --git a/src/app/qgsprojectproperties.cpp b/src/app/qgsprojectproperties.cpp
@@ -943,6 +943,10 @@ void QgsProjectProperties::apply()
 {
   mMapCanvas->enableMapTileRendering( mMapTileRenderingCheckBox->isChecked() );
 
+  // important - set the transform context first, as changing the project CRS may otherwise change this and
+  // cause loss of user changes
+  QgsCoordinateTransformContext transformContext = mDatumTransformTableWidget->transformContext();
+  QgsProject::instance()->setTransformContext( transformContext );
   if ( projectionSelector->hasValidSelection() )
   {
     QgsCoordinateReferenceSystem srs = projectionSelector->crs();
@@ -962,9 +966,6 @@ void QgsProjectProperties::apply()
     projectionSelector->pushProjectionToFront();
   }
 
-  QgsCoordinateTransformContext transformContext = mDatumTransformTableWidget->transformContext();
-  QgsProject::instance()->setTransformContext( transformContext );
-
   mMetadataWidget->acceptMetadata();
 
   // Set the project title

Original file line number	Diff line number	Diff line change
`@@ -943,6 +943,10 @@ void QgsProjectProperties::apply()`
`943`	`943`	`{`
`944`	`944`	`mMapCanvas->enableMapTileRendering( mMapTileRenderingCheckBox->isChecked() );`
`945`	`945`
	`946`	`+ // important - set the transform context first, as changing the project CRS may otherwise change this and`
	`947`	`+ // cause loss of user changes`
	`948`	`+ QgsCoordinateTransformContext transformContext = mDatumTransformTableWidget->transformContext();`
	`949`	`+ QgsProject::instance()->setTransformContext( transformContext );`
`946`	`950`	`if ( projectionSelector->hasValidSelection() )`
`947`	`951`	`{`
`948`	`952`	`QgsCoordinateReferenceSystem srs = projectionSelector->crs();`
`@@ -962,9 +966,6 @@ void QgsProjectProperties::apply()`
`962`	`966`	`projectionSelector->pushProjectionToFront();`
`963`	`967`	`}`
`964`	`968`
`965`		`- QgsCoordinateTransformContext transformContext = mDatumTransformTableWidget->transformContext();`
`966`		`- QgsProject::instance()->setTransformContext( transformContext );`
`967`		`-`
`968`	`969`	`mMetadataWidget->acceptMetadata();`
`969`	`970`
`970`	`971`	`// Set the project title`