Use completeBaseName for exported atlas path

qgis · May 28, 2019 · cb5c09f · cb5c09f
1 parent 63900d0
commit cb5c09f
Showing 1 changed file with 1 addition and 7 deletions.
diff --git a/src/core/layout/qgslayoutexporter.cpp b/src/core/layout/qgslayoutexporter.cpp
@@ -343,14 +343,8 @@ QgsLayoutExporter::ExportResult QgsLayoutExporter::exportToImage( const QString
 
   PageExportDetails pageDetails;
   pageDetails.directory = fi.path();
-  pageDetails.baseName = fi.baseName();
+  pageDetails.baseName = fi.completeBaseName();
   pageDetails.extension = fi.suffix();
-  // Deal with multiple dots, issue GH-29980
-  const auto completeSuffix { fi.completeSuffix() };
-  if ( completeSuffix != pageDetails.extension )
-  {
-    pageDetails.baseName = pageDetails.baseName + '.' + completeSuffix.left( completeSuffix.length() - 1 - pageDetails.extension.length() );
-  }
 
   LayoutContextPreviewSettingRestorer restorer( mLayout );
   ( void )restorer;