Fix for #6937, ensure QgsRubberBand is deleted if no active vector layer

dakcarto · dakcarto · commit a385162cd176 · 2013-01-01T14:02:32.000-07:00
diff --git a/src/app/qgsmaptoolselectrectangle.cpp b/src/app/qgsmaptoolselectrectangle.cpp
@@ -66,6 +66,13 @@ void QgsMapToolSelectRectangle::canvasReleaseEvent( QMouseEvent *e )
   QgsVectorLayer* vlayer = QgsMapToolSelectUtils::getCurrentVectorLayer( mCanvas );
   if ( vlayer == NULL )
   {
+    if ( mRubberBand )
+    {
+      mRubberBand->reset( QGis::Polygon );
+      delete mRubberBand;
+      mRubberBand = 0;
+      mDragging = false;
+    }
     return;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,13 @@ void QgsMapToolSelectRectangle::canvasReleaseEvent( QMouseEvent *e )`
`66`	`66`	`QgsVectorLayer* vlayer = QgsMapToolSelectUtils::getCurrentVectorLayer( mCanvas );`
`67`	`67`	`if ( vlayer == NULL )`
`68`	`68`	`{`
	`69`	`+ if ( mRubberBand )`
	`70`	`+ {`
	`71`	`+ mRubberBand->reset( QGis::Polygon );`
	`72`	`+ delete mRubberBand;`
	`73`	`+ mRubberBand = 0;`
	`74`	`+ mDragging = false;`
	`75`	`+ }`
`69`	`76`	`return;`
`70`	`77`	`}`
`71`	`78`