Simplify code

qgis · Aug 24, 2018 · dea911d · dea911d
1 parent b6fbdec
commit dea911d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/src/gui/qgsmaptoolcapture.cpp b/src/gui/qgsmaptoolcapture.cpp
@@ -42,7 +42,6 @@ QgsMapToolCapture::QgsMapToolCapture( QgsMapCanvas *canvas, QgsAdvancedDigitizin
   : QgsMapToolAdvancedDigitizing( canvas, cadDockWidget )
   , mCaptureMode( mode )
 {
-  mCaptureModeFromLayer = mode == CaptureNone;
   mCapturing = false;
 
   mSnapIndicator.reset( new QgsSnapIndicator( canvas ) );
@@ -96,11 +95,9 @@ void QgsMapToolCapture::validationFinished()
 
 void QgsMapToolCapture::currentLayerChanged( QgsMapLayer *layer )
 {
-  if ( !mCaptureModeFromLayer )
+  if ( mCaptureMode != CaptureNone )
     return;
 
-  mCaptureMode = CaptureNone;
-
   QgsVectorLayer *vlayer = qobject_cast<QgsVectorLayer *>( layer );
   if ( !vlayer )
   {

diff --git a/src/gui/qgsmaptoolcapture.h b/src/gui/qgsmaptoolcapture.h
@@ -268,8 +268,6 @@ class GUI_EXPORT QgsMapToolCapture : public QgsMapToolAdvancedDigitizing
     QList< QgsGeometry::Error > mGeomErrors;
     QList< QgsVertexMarker * > mGeomErrorMarkers;
 
-    bool mCaptureModeFromLayer;
-
     std::unique_ptr<QgsSnapIndicator> mSnapIndicator;
 
     /**