Fix #10514 (snapping marker visible even if not snapped to anything)

qgis · Jun 10, 2014 · f13f6ee · f13f6ee
1 parent ff9356f
commit f13f6ee
Showing 1 changed file with 16 additions and 8 deletions.
diff --git a/src/app/qgsmaptoolcapture.cpp b/src/app/qgsmaptoolcapture.cpp
@@ -108,14 +108,22 @@ void QgsMapToolCapture::canvasMoveEvent( QMouseEvent * e )
   QList<QgsSnappingResult> snapResults;
   if ( mSnapper.snapToBackgroundLayers( e->pos(), snapResults ) == 0 )
   {
-    delete mSnappingMarker;
-
-    mSnappingMarker = new QgsVertexMarker( mCanvas );
-    mSnappingMarker->setIconType( QgsVertexMarker::ICON_CROSS );
-    mSnappingMarker->setColor( Qt::magenta );
-    mSnappingMarker->setPenWidth( 3 );
-    mSnappingMarker->setCenter( snapPointFromResults( snapResults, e->pos() ) );
-
+    if ( snapResults.isEmpty() )
+    {
+      delete mSnappingMarker;
+      mSnappingMarker = 0;
+    }
+    else
+    {
+      if ( !mSnappingMarker )
+      {
+        mSnappingMarker = new QgsVertexMarker( mCanvas );
+        mSnappingMarker->setIconType( QgsVertexMarker::ICON_CROSS );
+        mSnappingMarker->setColor( Qt::magenta );
+        mSnappingMarker->setPenWidth( 3 );
+      }
+      mSnappingMarker->setCenter( snapResults.constBegin()->snappedVertex );
+    }
 
     if ( mCaptureMode != CapturePoint && mTempRubberBand && mCapturing )
     {