Concat successive if

lbartoletti · lbartoletti · commit f20041dc6056 · 2017-10-03T20:18:23.000+02:00
diff --git a/src/app/qgsmaptoolcircle2points.cpp b/src/app/qgsmaptoolcircle2points.cpp
@@ -35,13 +35,10 @@ void QgsMapToolCircle2Points::cadCanvasReleaseEvent( QgsMapMouseEvent *e )
   {
     mPoints.append( mapPoint );
 
-    if ( !mPoints.isEmpty() )
+    if ( !mPoints.isEmpty() && !mTempRubberBand )
     {
-      if ( !mTempRubberBand )
-      {
-        mTempRubberBand = createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true );
-        mTempRubberBand->show();
-      }
+      mTempRubberBand = createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true );
+      mTempRubberBand->show();
     }
   }
   else if ( e->button() == Qt::RightButton )

Original file line number	Diff line number	Diff line change
`@@ -35,13 +35,10 @@ void QgsMapToolCircle2Points::cadCanvasReleaseEvent( QgsMapMouseEvent *e )`
`35`	`35`	`{`
`36`	`36`	`mPoints.append( mapPoint );`
`37`	`37`
`38`		`- if ( !mPoints.isEmpty() )`
	`38`	`+ if ( !mPoints.isEmpty() && !mTempRubberBand )`
`39`	`39`	`{`
`40`		`- if ( !mTempRubberBand )`
`41`		`- {`
`42`		`- mTempRubberBand = createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true );`
`43`		`- mTempRubberBand->show();`
`44`		`- }`
	`40`	`+ mTempRubberBand = createGeometryRubberBand( ( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true );`
	`41`	`+ mTempRubberBand->show();`
`45`	`42`	`}`
`46`	`43`	`}`
`47`	`44`	`else if ( e->button() == Qt::RightButton )`