Fix some use of canvas CRS when project CRS should be used

nyalldawson · nyalldawson · commit f0489c9fc659 · 2017-02-28T15:45:58.000+10:00
diff --git a/src/app/dwg/qgsdwgimportdialog.cpp b/src/app/dwg/qgsdwgimportdialog.cpp
@@ -73,7 +73,7 @@ QgsDwgImportDialog::QgsDwgImportDialog( QWidget *parent, Qt::WindowFlags f )
   pbImportDrawing->setHidden( true );
   lblMessage->setHidden( true );
 
-  int crsid = s.value( "/DwgImport/lastCrs", QString::number( QgisApp::instance()->mapCanvas()->mapSettings().destinationCrs().srsid() ) ).toInt();
+  int crsid = s.value( "/DwgImport/lastCrs", QString::number( QgsProject::instance()->crs().srsid() ) ).toInt();
 
   QgsCoordinateReferenceSystem crs( crsid, QgsCoordinateReferenceSystem::InternalCrsId );
   mCrsSelector->setCrs( crs );
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -3367,7 +3367,7 @@ void QgisApp::saveRecentProjectPath( const QString& projectPath, bool savePrevie
   if ( projectData.title.isEmpty() )
     projectData.title = projectData.path;
 
-  projectData.crs = mMapCanvas->mapSettings().destinationCrs().authid();
+  projectData.crs = QgsProject::instance()->crs().authid();
 
   if ( savePreviewImage )
   {
diff --git a/src/app/qgsdxfexportdialog.cpp b/src/app/qgsdxfexportdialog.cpp
@@ -461,7 +461,7 @@ QgsDxfExportDialog::QgsDxfExportDialog( QWidget *parent, Qt::WindowFlags f )
   restoreGeometry( s.value( QStringLiteral( "/Windows/DxfExport/geometry" ) ).toByteArray() );
 
   long crsid = QgsProject::instance()->readEntry( QStringLiteral( "dxf" ), QStringLiteral( "/lastDxfCrs" ),
-               s.value( QStringLiteral( "qgis/lastDxfCrs" ), QString::number( QgisApp::instance()->mapCanvas()->mapSettings().destinationCrs().srsid() ) ).toString()
+               s.value( QStringLiteral( "qgis/lastDxfCrs" ), QString::number( QgsProject::instance()->crs().srsid() ) ).toString()
                                                 ).toLong();
   mCRS = QgsCoordinateReferenceSystem::fromSrsId( crsid );
   mCrsSelector->setCrs( mCRS );

Original file line number	Diff line number	Diff line change
`@@ -3367,7 +3367,7 @@ void QgisApp::saveRecentProjectPath( const QString& projectPath, bool savePrevie`
`3367`	`3367`	`if ( projectData.title.isEmpty() )`
`3368`	`3368`	`projectData.title = projectData.path;`
`3369`	`3369`
`3370`		`- projectData.crs = mMapCanvas->mapSettings().destinationCrs().authid();`
	`3370`	`+ projectData.crs = QgsProject::instance()->crs().authid();`
`3371`	`3371`
`3372`	`3372`	`if ( savePreviewImage )`
`3373`	`3373`	`{`