Fix another crash when transforms cannot be created

nyalldawson · nyalldawson · commit 399a1bf11a61 · 2019-06-05T04:01:28.000+10:00
diff --git a/src/core/qgscoordinatetransform_p.cpp b/src/core/qgscoordinatetransform_p.cpp
@@ -455,11 +455,13 @@ ProjData QgsCoordinateTransformPrivate::threadLocalProjData()
         }
 
         // transform may have either the source or destination CRS using swapped axis order. For QGIS, we ALWAYS need regular x/y axis order
-        transform.reset( proj_normalize_for_visualization( context, transform.get() ) );
+        if ( transform )
+          transform.reset( proj_normalize_for_visualization( context, transform.get() ) );
         if ( !transform )
         {
           const QString err = QObject::tr( "Cannot normalize transform between %1 and %2" ).arg( mSourceCRS.authid() )
                               .arg( mDestCRS.authid() );
+          QgsMessageLog::logMessage( err, QString(), Qgis::Critical );
         }
       }
       proj_list_destroy( ops );

Original file line number	Diff line number	Diff line change
`@@ -455,11 +455,13 @@ ProjData QgsCoordinateTransformPrivate::threadLocalProjData()`
`455`	`455`	`}`
`456`	`456`
`457`	`457`	`// transform may have either the source or destination CRS using swapped axis order. For QGIS, we ALWAYS need regular x/y axis order`
`458`		`- transform.reset( proj_normalize_for_visualization( context, transform.get() ) );`
	`458`	`+ if ( transform )`
	`459`	`+ transform.reset( proj_normalize_for_visualization( context, transform.get() ) );`
`459`	`460`	`if ( !transform )`
`460`	`461`	`{`
`461`	`462`	`const QString err = QObject::tr( "Cannot normalize transform between %1 and %2" ).arg( mSourceCRS.authid() )`
`462`	`463`	`.arg( mDestCRS.authid() );`
	`464`	`+ QgsMessageLog::logMessage( err, QString(), Qgis::Critical );`
`463`	`465`	`}`
`464`	`466`	`}`
`465`	`467`	`proj_list_destroy( ops );`