Merge pull request #29968 from elpaso/bugfix-gh29821-layout-crash-py

QgsLayoutAtlasWidget: Disconnect signals when layout RIP
qgis · May 28, 2019 · 4b35d85 · 4b35d85
2 parents bede196 + 47f739c
commit 4b35d85
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/app/layout/qgslayoutatlaswidget.cpp b/src/app/layout/qgslayoutatlaswidget.cpp
@@ -63,7 +63,7 @@ QgsLayoutAtlasWidget::QgsLayoutAtlasWidget( QWidget *parent, QgsPrintLayout *lay
   {
     mAtlasFileFormat->addItem( QString( formats.at( i ) ) );
   }
-  connect( mAtlasFileFormat, static_cast<void ( QComboBox::* )( int )>( &QComboBox::currentIndexChanged ), this, [ = ]( int ) { changeFileFormat(); } );
+  connect( mAtlasFileFormat, qgis::overload<int>::of( &QComboBox::currentIndexChanged ), this, [ = ]( int ) { changeFileFormat(); } );
 
   updateGuiElements();
 }

diff --git a/src/app/layout/qgslayoutdesignerdialog.cpp b/src/app/layout/qgslayoutdesignerdialog.cpp
@@ -966,7 +966,11 @@ void QgsLayoutDesignerDialog::setMasterLayout( QgsMasterLayoutInterface *layout
 
   QObject *obj = dynamic_cast< QObject * >( mMasterLayout );
   if ( obj )
-    connect( obj, &QObject::destroyed, this, &QgsLayoutDesignerDialog::close );
+    connect( obj, &QObject::destroyed, [ = ]
+  {
+    this->close();
+    QgsApplication::sendPostedEvents( nullptr, QEvent::DeferredDelete );
+  } );
 
   setTitle( mMasterLayout->name() );