Guard against layer nullptr

qgis · Aug 26, 2018 · ac8eab2 · ac8eab2
1 parent 652737d
commit ac8eab2
Showing 1 changed file with 18 additions and 10 deletions.
diff --git a/src/gui/qgsmaptooladvanceddigitizing.cpp b/src/gui/qgsmaptooladvanceddigitizing.cpp
@@ -123,8 +123,12 @@ void QgsMapToolAdvancedDigitizing::activate()
   connect( mCadDockWidget, &QgsAdvancedDigitizingDockWidget::pointChanged, this, &QgsMapToolAdvancedDigitizing::cadPointChanged );
   mCadDockWidget->enable();
   mSnapToGridCanvasItem = new QgsSnapToGridCanvasItem( mCanvas );
-  mSnapToGridCanvasItem->setCrs( currentVectorLayer()->crs() );
-  mSnapToGridCanvasItem->setPrecision( currentVectorLayer()->geometryFixes()->geometryPrecision() );
+  QgsVectorLayer *layer = currentVectorLayer();
+  if ( layer )
+  {
+    mSnapToGridCanvasItem->setCrs( currentVectorLayer()->crs() );
+    mSnapToGridCanvasItem->setPrecision( currentVectorLayer()->geometryFixes()->geometryPrecision() );
+  }
   mSnapToGridCanvasItem->setEnabled( mSnapToGridEnabled );
 }
 
@@ -146,16 +150,20 @@ void QgsMapToolAdvancedDigitizing::cadPointChanged( const QgsPointXY &point )
 
 void QgsMapToolAdvancedDigitizing::onCurrentLayerChanged()
 {
-  QgsVectorLayer *layer = currentVectorLayer();
-  if ( mSnapToGridCanvasItem && layer && mSnapToGridEnabled )
+  if ( mSnapToGridCanvasItem )
   {
-    mSnapToGridCanvasItem->setPrecision( layer->geometryFixes()->geometryPrecision() );
-    mSnapToGridCanvasItem->setCrs( layer->crs() );
-    mSnapToGridCanvasItem->setEnabled( true );
-  }
+    QgsVectorLayer *layer = currentVectorLayer();
+    if ( layer && mSnapToGridEnabled )
+    {
+      mSnapToGridCanvasItem->setPrecision( layer->geometryFixes()->geometryPrecision() );
+      mSnapToGridCanvasItem->setCrs( layer->crs() );
+    }
 
-  if ( !layer )
-    mSnapToGridCanvasItem->setEnabled( false );
+    if ( !layer )
+      mSnapToGridCanvasItem->setEnabled( false );
+    else
+      mSnapToGridCanvasItem->setEnabled( mSnapToGridEnabled );
+  }
 }
 
 bool QgsMapToolAdvancedDigitizing::snapToGridEnabled() const