Fix layout display when canceling export settings dialogs

nyalldawson · nyalldawson · commit 93fd5deebf6d · 2018-12-11T14:32:19.000+10:00
(cherry picked from commit d7b4182)
diff --git a/src/app/layout/qgslayoutdesignerdialog.cpp b/src/app/layout/qgslayoutdesignerdialog.cpp
@@ -2066,13 +2066,13 @@ void QgsLayoutDesignerDialog::exportToPdf()
 
   setLastExportPath( outputFileName );
 
-  mView->setPaintingEnabled( false );
-  QgsTemporaryCursorOverride cursorOverride( Qt::BusyCursor );
-
   QgsLayoutExporter::PdfExportSettings pdfSettings;
   if ( !getPdfExportSettings( pdfSettings ) )
     return;
 
+  mView->setPaintingEnabled( false );
+  QgsTemporaryCursorOverride cursorOverride( Qt::BusyCursor );
+
   QgsProxyProgressTask *proxyTask = new QgsProxyProgressTask( tr( "Exporting “%1”" ).arg( mMasterLayout->name() ) );
   QgsApplication::taskManager()->addTask( proxyTask );
 
@@ -2969,13 +2969,12 @@ void QgsLayoutDesignerDialog::exportAtlasToPdf()
     outputFileName = QDir( dir ).filePath( QStringLiteral( "atlas" ) ); // filename is overridden by atlas
   }
 
-  mView->setPaintingEnabled( false );
-  QgsTemporaryCursorOverride cursorOverride( Qt::BusyCursor );
-
   QgsLayoutExporter::PdfExportSettings pdfSettings;
   if ( !getPdfExportSettings( pdfSettings ) )
     return;
 
+  mView->setPaintingEnabled( false );
+  QgsTemporaryCursorOverride cursorOverride( Qt::BusyCursor );
   pdfSettings.rasterizeWholeImage = mLayout->customProperty( QStringLiteral( "rasterize" ), false ).toBool();
 
   QString error;
@@ -3347,9 +3346,6 @@ void QgsLayoutDesignerDialog::exportReportToPdf()
   }
   setLastExportPath( outputFileName );
 
-  mView->setPaintingEnabled( false );
-  QgsTemporaryCursorOverride cursorOverride( Qt::BusyCursor );
-
   bool rasterize = false;
   if ( mLayout )
   {
@@ -3359,6 +3355,9 @@ void QgsLayoutDesignerDialog::exportReportToPdf()
   if ( !getPdfExportSettings( pdfSettings ) )
     return;
 
+  mView->setPaintingEnabled( false );
+  QgsTemporaryCursorOverride cursorOverride( Qt::BusyCursor );
+
   pdfSettings.rasterizeWholeImage = rasterize;
 
   QString error;
