Fix a crash when using map composer within python

wonder · wonder · commit 3071ebb1336d · 2010-05-30T14:46:42.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13602 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/composer/qgscomposition.cpp b/src/core/composer/qgscomposition.cpp
@@ -52,6 +52,11 @@ QgsComposition::QgsComposition(): QGraphicsScene( 0 ), mMapRenderer( 0 ), mPlotS
 QgsComposition::~QgsComposition()
 {
   delete mPaperItem;
+
+  // make sure that all composer items are removed before
+  // this class is deconstructed - to avoid segfaults
+  // when composer items access in destructor composition that isn't valid anymore
+  clear();
 }
 
 void QgsComposition::setPaperSize( double width, double height )

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,11 @@ QgsComposition::QgsComposition(): QGraphicsScene( 0 ), mMapRenderer( 0 ), mPlotS`
`52`	`52`	`QgsComposition::~QgsComposition()`
`53`	`53`	`{`
`54`	`54`	`delete mPaperItem;`
	`55`	`+`
	`56`	`+ // make sure that all composer items are removed before`
	`57`	`+ // this class is deconstructed - to avoid segfaults`
	`58`	`+ // when composer items access in destructor composition that isn't valid anymore`
	`59`	`+ clear();`
`55`	`60`	`}`
`56`	`61`
`57`	`62`	`void QgsComposition::setPaperSize( double width, double height )`