Merge pull request #30017 from elpaso/bugfix-gh29747-layout-mgr-crashes-copying

elpaso · web-flow · commit 3885944c5937 · 2019-05-30T10:36:32.000+02:00
Don't crash when copying layout elements
diff --git a/src/gui/layout/qgslayoutview.cpp b/src/gui/layout/qgslayoutview.cpp
@@ -339,7 +339,7 @@ void QgsLayoutView::copyItems( const QList<QgsLayoutItem *> &items, QgsLayoutVie
     else if ( QgsLayoutFrame *frame = qobject_cast<QgsLayoutFrame *>( item ) )
     {
       // copy multiframe too
-      if ( !copiedMultiFrames.contains( frame->multiFrame() ) )
+      if ( frame->multiFrame() && !copiedMultiFrames.contains( frame->multiFrame() ) )
       {
         frame->multiFrame()->writeXml( documentElement, doc, context );
         copiedMultiFrames.insert( frame->multiFrame() );

Original file line number	Diff line number	Diff line change
`@@ -339,7 +339,7 @@ void QgsLayoutView::copyItems( const QList<QgsLayoutItem *> &items, QgsLayoutVie`
`339`	`339`	`else if ( QgsLayoutFrame frame = qobject_cast<QgsLayoutFrame >( item ) )`
`340`	`340`	`{`
`341`	`341`	`// copy multiframe too`
`342`		`- if ( !copiedMultiFrames.contains( frame->multiFrame() ) )`
	`342`	`+ if ( frame->multiFrame() && !copiedMultiFrames.contains( frame->multiFrame() ) )`
`343`	`343`	`{`
`344`	`344`	`frame->multiFrame()->writeXml( documentElement, doc, context );`
`345`	`345`	`copiedMultiFrames.insert( frame->multiFrame() );`