diff --git a/src/app/qgsmaptoolcircle2points.cpp b/src/app/qgsmaptoolcircle2points.cpp
index a5707c82efd..7ec138db9a4 100644
--- 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 )
diff --git a/src/app/qgsmaptoolcircle3points.cpp b/src/app/qgsmaptoolcircle3points.cpp
index 1cb5c92e20b..aeadc614501 100644
--- a/src/app/qgsmaptoolcircle3points.cpp
+++ b/src/app/qgsmaptoolcircle3points.cpp
@@ -36,13 +36,10 @@ void QgsMapToolCircle3Points::cadCanvasReleaseEvent( QgsMapMouseEvent *e )
     if ( mPoints.size() < 2 )
       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 )
diff --git a/src/app/qgsmaptoolcirclecenterpoint.cpp b/src/app/qgsmaptoolcirclecenterpoint.cpp
index d3151d82f3d..d2c9ff8e351 100644
--- a/src/app/qgsmaptoolcirclecenterpoint.cpp
+++ b/src/app/qgsmaptoolcirclecenterpoint.cpp
@@ -35,14 +35,12 @@ void QgsMapToolCircleCenterPoint::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 )
   {
diff --git a/src/app/qgsmaptoolellipsecenter2points.cpp b/src/app/qgsmaptoolellipsecenter2points.cpp
index 4bddb270ac2..4106969226a 100644
--- a/src/app/qgsmaptoolellipsecenter2points.cpp
+++ b/src/app/qgsmaptoolellipsecenter2points.cpp
@@ -38,13 +38,10 @@ void QgsMapToolEllipseCenter2Points::cadCanvasReleaseEvent( QgsMapMouseEvent *e
     if ( mPoints.size() < 2 )
       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 )
diff --git a/src/app/qgsmaptoolellipsecenterpoint.cpp b/src/app/qgsmaptoolellipsecenterpoint.cpp
index e6aca3867e2..17c600a427f 100644
--- a/src/app/qgsmaptoolellipsecenterpoint.cpp
+++ b/src/app/qgsmaptoolellipsecenterpoint.cpp
@@ -35,13 +35,10 @@ void QgsMapToolEllipseCenterPoint::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 )
diff --git a/src/app/qgsmaptoolellipseextent.cpp b/src/app/qgsmaptoolellipseextent.cpp
index 338fd45afee..c2723effb39 100644
--- a/src/app/qgsmaptoolellipseextent.cpp
+++ b/src/app/qgsmaptoolellipseextent.cpp
@@ -35,13 +35,10 @@ void QgsMapToolEllipseExtent::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 )
diff --git a/src/app/qgsmaptoolellipsefoci.cpp b/src/app/qgsmaptoolellipsefoci.cpp
index 7be0c467ebc..1fc1a33249e 100644
--- a/src/app/qgsmaptoolellipsefoci.cpp
+++ b/src/app/qgsmaptoolellipsefoci.cpp
@@ -36,13 +36,10 @@ void QgsMapToolEllipseFoci::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 )
diff --git a/src/app/qgsmaptoolrectangle3points.cpp b/src/app/qgsmaptoolrectangle3points.cpp
index 96b41f6d64c..ce12253f49e 100644
--- a/src/app/qgsmaptoolrectangle3points.cpp
+++ b/src/app/qgsmaptoolrectangle3points.cpp
@@ -38,14 +38,12 @@ void QgsMapToolRectangle3Points::cadCanvasReleaseEvent( QgsMapMouseEvent *e )
     if ( mPoints.size() < 2 )
       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 )
   {
diff --git a/src/app/qgsmaptoolrectanglecenter.cpp b/src/app/qgsmaptoolrectanglecenter.cpp
index 222ebfcbf06..f11ba113de8 100644
--- a/src/app/qgsmaptoolrectanglecenter.cpp
+++ b/src/app/qgsmaptoolrectanglecenter.cpp
@@ -37,14 +37,12 @@ void QgsMapToolRectangleCenter::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 )
   {
diff --git a/src/app/qgsmaptoolrectangleextent.cpp b/src/app/qgsmaptoolrectangleextent.cpp
index 5c9e78c1b26..abf9645af67 100644
--- a/src/app/qgsmaptoolrectangleextent.cpp
+++ b/src/app/qgsmaptoolrectangleextent.cpp
@@ -36,14 +36,12 @@ void QgsMapToolRectangleExtent::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 )
   {
diff --git a/src/app/qgsmaptoolsquarecenter.cpp b/src/app/qgsmaptoolsquarecenter.cpp
index c9e0b6d6efb..576eb3e1a83 100644
--- a/src/app/qgsmaptoolsquarecenter.cpp
+++ b/src/app/qgsmaptoolsquarecenter.cpp
@@ -41,14 +41,12 @@ void QgsMapToolSquareCenter::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 )
   {