From fdb9b97f4e04409e47a07733073aad0390288607 Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Thu, 26 Sep 2019 15:16:46 +1000 Subject: [PATCH] Don't report successful geopdf creation when it wasn't successful --- src/core/layout/qgslayoutexporter.cpp | 3 ++- src/core/qgsmaprenderertask.cpp | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/core/layout/qgslayoutexporter.cpp b/src/core/layout/qgslayoutexporter.cpp index 0659c461526..d56a07d448a 100644 --- a/src/core/layout/qgslayoutexporter.cpp +++ b/src/core/layout/qgslayoutexporter.cpp @@ -645,7 +645,8 @@ QgsLayoutExporter::ExportResult QgsLayoutExporter::exportToPdf( const QString &f details.useOgcBestPracticeFormatGeoreferencing = settings.useOgcBestPracticeFormatGeoreferencing; details.useIso32000ExtensionFormatGeoreferencing = settings.useIso32000ExtensionFormatGeoreferencing; - geoPdfExporter->finalize( pdfComponents, filePath, details ); + if ( !geoPdfExporter->finalize( pdfComponents, filePath, details ) ) + result = PrintError; } else { diff --git a/src/core/qgsmaprenderertask.cpp b/src/core/qgsmaprenderertask.cpp index 82d7d3c6b41..43bdd787cf1 100644 --- a/src/core/qgsmaprenderertask.cpp +++ b/src/core/qgsmaprenderertask.cpp @@ -226,11 +226,11 @@ bool QgsMapRendererTask::run() exportDetails.georeferencedSections << georef; } - mGeoPdfExporter->finalize( pdfComponents, mFileName, exportDetails ); + const bool res = mGeoPdfExporter->finalize( pdfComponents, mFileName, exportDetails ); mGeoPdfExporter.reset(); mTempPainter.reset(); mPrinter.reset(); - return true; + return res; #endif } else