Merge pull request #7875 from m-kuhn/avoidCrashSnapToGrid

Fix crash when adding feature to non-spatial layer
qgis · Sep 13, 2018 · 9e40a78 · 9e40a78
2 parents d3ee0f9 + 2182e2d
commit 9e40a78
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/gui/qgsmaptooladvanceddigitizing.cpp b/src/gui/qgsmaptooladvanceddigitizing.cpp
@@ -83,7 +83,7 @@ void QgsMapToolAdvancedDigitizing::canvasReleaseEvent( QgsMapMouseEvent *e )
   }
 
   QgsVectorLayer *layer = currentVectorLayer();
-  if ( mSnapToLayerGridEnabled && layer )
+  if ( mSnapToGridCanvasItem && mSnapToLayerGridEnabled && layer )
   {
     e->snapToGrid( layer->geometryFixes()->geometryPrecision(), layer->crs() );
   }
@@ -108,7 +108,7 @@ void QgsMapToolAdvancedDigitizing::canvasMoveEvent( QgsMapMouseEvent *e )
   }
 
   QgsVectorLayer *layer = currentVectorLayer();
-  if ( mSnapToLayerGridEnabled && layer )
+  if ( mSnapToGridCanvasItem && mSnapToLayerGridEnabled && layer )
   {
     e->snapToGrid( layer->geometryFixes()->geometryPrecision(), layer->crs() );
     mSnapToGridCanvasItem->setPoint( e->mapPoint() );