Fix for a crash in composer (fixes #2374)

mhugent · mhugent · commit 963d72633b26 · 2010-01-19T13:45:18.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@12797 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/gui/qgscomposerview.cpp b/src/gui/qgscomposerview.cpp
@@ -241,8 +241,12 @@ void QgsComposerView::mouseReleaseEvent( QMouseEvent* e )
     {
       if ( !mRubberBandItem || mRubberBandItem->rect().width() < 0.1 || mRubberBandItem->rect().width() < 0.1 )
       {
-        scene()->removeItem( mRubberBandItem );
-        delete mRubberBandItem;
+        if ( mRubberBandItem )
+        {
+          scene()->removeItem( mRubberBandItem );
+          delete mRubberBandItem;
+          mRubberBandItem = 0;
+        }
         return;
       }
 

Original file line number	Diff line number	Diff line change
`@@ -241,8 +241,12 @@ void QgsComposerView::mouseReleaseEvent( QMouseEvent* e )`
`241`	`241`	`{`
`242`	`242`	`if ( !mRubberBandItem \|\| mRubberBandItem->rect().width() < 0.1 \|\| mRubberBandItem->rect().width() < 0.1 )`
`243`	`243`	`{`
`244`		`- scene()->removeItem( mRubberBandItem );`
`245`		`- delete mRubberBandItem;`
	`244`	`+ if ( mRubberBandItem )`
	`245`	`+ {`
	`246`	`+ scene()->removeItem( mRubberBandItem );`
	`247`	`+ delete mRubberBandItem;`
	`248`	`+ mRubberBandItem = 0;`
	`249`	`+ }`
`246`	`250`	`return;`
`247`	`251`	`}`
`248`	`252`