sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-01 00:46:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #39135 from elpaso/bugfix-gh39086-empty-report-crash

Browse Source 
Fix crash when exporting empty report
This commit is contained in:
Alessandro Pasotti 2020-10-03 23:06:55 +02:00 committed by GitHub
commit 8cd40aeebf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/layout/qgslayoutdesignerdialog.cpp
View File

@ -274,7 +274,10 @@ class QgsAtlasExportGuard
mDialog->mIsExportingAtlas = false; mDialog->mIsExportingAtlas = false;
// need to update the GUI to reflect the final atlas feature // need to update the GUI to reflect the final atlas feature
mDialog->atlasFeatureChanged( mDialog->currentLayout()->reportContext().feature() ); if ( mDialog->currentLayout() )
{
mDialog->atlasFeatureChanged( mDialog->currentLayout()->reportContext().feature() );
}
} }
private: private:
@ -4655,6 +4658,7 @@ void QgsLayoutDesignerDialog::toggleActions( bool layoutAvailable )
mActionExportAsPDF->setEnabled( layoutAvailable ); mActionExportAsPDF->setEnabled( layoutAvailable );
mActionExportAsSVG->setEnabled( layoutAvailable ); mActionExportAsSVG->setEnabled( layoutAvailable );
mActionPrint->setEnabled( layoutAvailable ); mActionPrint->setEnabled( layoutAvailable );
mActionPrintReport->setEnabled( layoutAvailable );
mActionCut->setEnabled( layoutAvailable ); mActionCut->setEnabled( layoutAvailable );
mActionCopy->setEnabled( layoutAvailable ); mActionCopy->setEnabled( layoutAvailable );
mActionPaste->setEnabled( layoutAvailable ); mActionPaste->setEnabled( layoutAvailable );
@ -4776,7 +4780,7 @@ void QgsLayoutDesignerDialog::setLastExportPath( const QString &path ) const
QgsSettings().setValue( QStringLiteral( "lastLayoutExportDir" ), savePath, QgsSettings::App ); QgsSettings().setValue( QStringLiteral( "lastLayoutExportDir" ), savePath, QgsSettings::App );
} }
bool QgsLayoutDesignerDialog::checkBeforeExport() bool QgsLayoutDesignerDialog::checkBeforeExport( )
{ {
if ( mLayout ) if ( mLayout )
{ {