[QGIS Commit] r12797 - trunk/qgis/src/gui

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2010-01-19 08:45:18 -0500 (Tue, 19 Jan 2010)
New Revision: 12797

Modified:
   trunk/qgis/src/gui/qgscomposerview.cpp
Log:
Fix for a crash in composer (fixes #2374)

Modified: trunk/qgis/src/gui/qgscomposerview.cpp
===================================================================
--- trunk/qgis/src/gui/qgscomposerview.cpp	2010-01-19 12:44:04 UTC (rev 12796)
+++ trunk/qgis/src/gui/qgscomposerview.cpp	2010-01-19 13:45:18 UTC (rev 12797)
@@ -241,8 +241,12 @@
     {
       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;
       }