Merge pull request #38593 from nyalldawson/fix_annotation_layer_crash

Fix crash when creating project and default transform context has some entries
qgis · Sep 4, 2020 · 79fb756 · 79fb756
2 parents badbdb3 + eb68eb7
commit 79fb756
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/core/qgsproject.cpp b/src/core/qgsproject.cpp
@@ -376,6 +376,10 @@ QgsProject::QgsProject( QObject *parent )
   , mAuxiliaryStorage( new QgsAuxiliaryStorage() )
 {
   mProperties.setName( QStringLiteral( "properties" ) );
+
+  mMainAnnotationLayer = new QgsAnnotationLayer( QObject::tr( "Annotations" ), QgsAnnotationLayer::LayerOptions( mTransformContext ) );
+  mMainAnnotationLayer->setParent( this );
+
   clear();
 
   // bind the layer tree to the map layer registry.
@@ -433,9 +437,6 @@ QgsProject::QgsProject( QObject *parent )
   Q_NOWARN_DEPRECATED_PUSH
   connect( mViewSettings, &QgsProjectViewSettings::mapScalesChanged, this, &QgsProject::mapScalesChanged );
   Q_NOWARN_DEPRECATED_POP
-
-  mMainAnnotationLayer = new QgsAnnotationLayer( QObject::tr( "Annotations" ), QgsAnnotationLayer::LayerOptions( mTransformContext ) );
-  mMainAnnotationLayer->setParent( this );
 }