Fix tests: clear layers before theme export

qgis · Jun 9, 2021 · d10331e · d10331e
1 parent 5410095
commit d10331e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/core/layout/qgslayoutitemmap.cpp b/src/core/layout/qgslayoutitemmap.cpp
@@ -347,10 +347,7 @@ void QgsLayoutItemMap::setFollowVisibilityPreset( bool follow )
     return;
 
   mFollowVisibilityPreset = follow;
-  if ( follow )
-  {
-    mLayers.clear();
-  }
+
   if ( !mFollowVisibilityPresetName.isEmpty() )
     emit themeChanged( mFollowVisibilityPreset ? mFollowVisibilityPresetName : QString() );
 }

diff --git a/tests/src/core/testqgslayoutgeopdfexport.cpp b/tests/src/core/testqgslayoutgeopdfexport.cpp
@@ -256,6 +256,10 @@ void TestQgsLayoutGeoPdfExport::testCollectingFeatures()
   map2->setFollowVisibilityPreset( true );
   map2->setFollowVisibilityPresetName( QStringLiteral( "test preset3" ) );
 
+  // Clear layers
+  map->setLayers( {} );
+  map2->setLayers( {} );
+
   QgsLayoutGeoPdfExporter geoPdfExporter2( &l );
   settings = QgsLayoutExporter::PdfExportSettings();
   settings.writeGeoPdf = true;