Add a debug assert relating to multiframe item crashes

nyalldawson · nyalldawson · commit 77b570dab7da · 2018-01-23T07:14:44.000+11:00
diff --git a/src/core/layout/qgslayoutframe.cpp b/src/core/layout/qgslayoutframe.cpp
@@ -163,6 +163,7 @@ void QgsLayoutFrame::draw( QgsRenderContext &context, const QStyleOptionGraphics
   {
     //calculate index of frame
     int frameIndex = mMultiFrame->frameIndex( this );
+    Q_ASSERT_X( frameIndex >= 0, "QgsLayoutFrame::draw", "Invalid frame index for frame" );
     mMultiFrame->render( context, mSection, frameIndex, itemStyle );
   }
 }
diff --git a/src/core/layout/qgslayoutitemattributetable.cpp b/src/core/layout/qgslayoutitemattributetable.cpp
@@ -540,6 +540,7 @@ QgsExpressionContext QgsLayoutItemAttributeTable::createExpressionContext() cons
 
 void QgsLayoutItemAttributeTable::finalizeRestoreFromXml()
 {
+  QgsLayoutTable::finalizeRestoreFromXml();
   if ( !mMap && !mMapUuid.isEmpty() && mLayout )
   {
     mMap = qobject_cast< QgsLayoutItemMap *>( mLayout->itemByUuid( mMapUuid, true ) );
diff --git a/src/core/layout/qgslayoutmultiframe.cpp b/src/core/layout/qgslayoutmultiframe.cpp
@@ -54,7 +54,7 @@ double QgsLayoutMultiFrame::findNearbyPageBreak( double yPos )
 
 void QgsLayoutMultiFrame::addFrame( QgsLayoutFrame *frame, bool recalcFrameSizes )
 {
-  if ( !frame )
+  if ( !frame || mFrameItems.contains( frame ) )
     return;
 
   mFrameItems.push_back( frame );

Original file line number	Diff line number	Diff line change
`@@ -163,6 +163,7 @@ void QgsLayoutFrame::draw( QgsRenderContext &context, const QStyleOptionGraphics`
`163`	`163`	`{`
`164`	`164`	`//calculate index of frame`
`165`	`165`	`int frameIndex = mMultiFrame->frameIndex( this );`
	`166`	`+ Q_ASSERT_X( frameIndex >= 0, "QgsLayoutFrame::draw", "Invalid frame index for frame" );`
`166`	`167`	`mMultiFrame->render( context, mSection, frameIndex, itemStyle );`
`167`	`168`	`}`
`168`	`169`	`}`
Original file line number	Diff line number	Diff line change
`@@ -540,6 +540,7 @@ QgsExpressionContext QgsLayoutItemAttributeTable::createExpressionContext() cons`
`540`	`540`
`541`	`541`	`void QgsLayoutItemAttributeTable::finalizeRestoreFromXml()`
`542`	`542`	`{`
	`543`	`+ QgsLayoutTable::finalizeRestoreFromXml();`
`543`	`544`	`if ( !mMap && !mMapUuid.isEmpty() && mLayout )`
`544`	`545`	`{`
`545`	`546`	`mMap = qobject_cast< QgsLayoutItemMap *>( mLayout->itemByUuid( mMapUuid, true ) );`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ double QgsLayoutMultiFrame::findNearbyPageBreak( double yPos )`
`54`	`54`
`55`	`55`	`void QgsLayoutMultiFrame::addFrame( QgsLayoutFrame *frame, bool recalcFrameSizes )`
`56`	`56`	`{`
`57`		`- if ( !frame )`
	`57`	`+ if ( !frame \|\| mFrameItems.contains( frame ) )`
`58`	`58`	`return;`
`59`	`59`
`60`	`60`	`mFrameItems.push_back( frame );`