Revert "Simplify code"

This reverts commit dea911d.

Author: m-kuhn

src/gui/qgsmaptoolcapture.cpp

@@ -42,6 +42,7 @@ QgsMapToolCapture::QgsMapToolCapture( QgsMapCanvas *canvas, QgsAdvancedDigitizin
   : QgsMapToolAdvancedDigitizing( canvas, cadDockWidget )
   , mCaptureMode( mode )
 {
+  mCaptureModeFromLayer = mode == CaptureNone;
   mCapturing = false;
 
   mSnapIndicator.reset( new QgsSnapIndicator( canvas ) );
@@ -95,9 +96,11 @@ void QgsMapToolCapture::validationFinished()
 
 void QgsMapToolCapture::currentLayerChanged( QgsMapLayer *layer )
 {
-  if ( mCaptureMode != CaptureNone )
+  if ( !mCaptureModeFromLayer )
     return;
 
+  mCaptureMode = CaptureNone;
+
   QgsVectorLayer *vlayer = qobject_cast<QgsVectorLayer *>( layer );
   if ( !vlayer )
   {

src/gui/qgsmaptoolcapture.h

@@ -268,6 +268,8 @@ class GUI_EXPORT QgsMapToolCapture : public QgsMapToolAdvancedDigitizing
     QList< QgsGeometry::Error > mGeomErrors;
     QList< QgsVertexMarker * > mGeomErrorMarkers;
 
+    bool mCaptureModeFromLayer;
+
     std::unique_ptr<QgsSnapIndicator> mSnapIndicator;
 
     /**