Don't report successful geopdf creation when it wasn't successful

This commit is contained in:
Nyall Dawson 2019-09-26 15:16:46 +10:00
parent 1355c1fbd2
commit fdb9b97f4e
2 changed files with 4 additions and 3 deletions

View File

@ -645,7 +645,8 @@ QgsLayoutExporter::ExportResult QgsLayoutExporter::exportToPdf( const QString &f
details.useOgcBestPracticeFormatGeoreferencing = settings.useOgcBestPracticeFormatGeoreferencing; details.useOgcBestPracticeFormatGeoreferencing = settings.useOgcBestPracticeFormatGeoreferencing;
details.useIso32000ExtensionFormatGeoreferencing = settings.useIso32000ExtensionFormatGeoreferencing; details.useIso32000ExtensionFormatGeoreferencing = settings.useIso32000ExtensionFormatGeoreferencing;
geoPdfExporter->finalize( pdfComponents, filePath, details ); if ( !geoPdfExporter->finalize( pdfComponents, filePath, details ) )
result = PrintError;
} }
else else
{ {

View File

@ -226,11 +226,11 @@ bool QgsMapRendererTask::run()
exportDetails.georeferencedSections << georef; exportDetails.georeferencedSections << georef;
} }
mGeoPdfExporter->finalize( pdfComponents, mFileName, exportDetails ); const bool res = mGeoPdfExporter->finalize( pdfComponents, mFileName, exportDetails );
mGeoPdfExporter.reset(); mGeoPdfExporter.reset();
mTempPainter.reset(); mTempPainter.reset();
mPrinter.reset(); mPrinter.reset();
return true; return res;
#endif #endif
} }
else else