Merge pull request #7875 from m-kuhn/avoidCrashSnapToGrid

m-kuhn · web-flow · commit 9e40a78a558d · 2018-09-13T07:51:36.000+02:00
Fix crash when adding feature to non-spatial layer
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() );

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ void QgsMapToolAdvancedDigitizing::canvasReleaseEvent( QgsMapMouseEvent *e )`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`QgsVectorLayer *layer = currentVectorLayer();`
`86`		`- if ( mSnapToLayerGridEnabled && layer )`
	`86`	`+ if ( mSnapToGridCanvasItem && mSnapToLayerGridEnabled && layer )`
`87`	`87`	`{`
`88`	`88`	`e->snapToGrid( layer->geometryFixes()->geometryPrecision(), layer->crs() );`
`89`	`89`	`}`
`@@ -108,7 +108,7 @@ void QgsMapToolAdvancedDigitizing::canvasMoveEvent( QgsMapMouseEvent *e )`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`QgsVectorLayer *layer = currentVectorLayer();`
`111`		`- if ( mSnapToLayerGridEnabled && layer )`
	`111`	`+ if ( mSnapToGridCanvasItem && mSnapToLayerGridEnabled && layer )`
`112`	`112`	`{`
`113`	`113`	`e->snapToGrid( layer->geometryFixes()->geometryPrecision(), layer->crs() );`
`114`	`114`	`mSnapToGridCanvasItem->setPoint( e->mapPoint() );`