Don't include empty annotation layers in layout map exports

qgis · Sep 1, 2020 · 6a5eeca · 6a5eeca
1 parent 3710dbe
commit 6a5eeca
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/core/layout/qgslayoutitemmap.cpp b/src/core/layout/qgslayoutitemmap.cpp
@@ -1469,8 +1469,11 @@ QgsMapSettings QgsLayoutItemMap::mapSettings( const QgsRectangle &extent, QSizeF
     //set layers to render
     QList<QgsMapLayer *> layers = layersToRender( &expressionContext );
 
-    // render main annotation layer above all other layers
-    layers.insert( 0, mLayout->project()->mainAnnotationLayer() );
+    if ( !mLayout->project()->mainAnnotationLayer()->isEmpty() )
+    {
+      // render main annotation layer above all other layers
+      layers.insert( 0, mLayout->project()->mainAnnotationLayer() );
+    }
 
     jobMapSettings.setLayers( layers );
     jobMapSettings.setLayerStyleOverrides( layerStyleOverridesToRender( expressionContext ) );