Merge branch 'master' of github.com:qgis/QGIS

pcav · pcav · commit 7138c7aaf0df · 2014-02-18T11:45:48.000+01:00
diff --git a/src/app/qgsmaptooladdfeature.cpp b/src/app/qgsmaptooladdfeature.cpp
@@ -95,6 +95,9 @@ void QgsMapToolAddFeature::canvasReleaseEvent( QMouseEvent * e )
   // POINT CAPTURING
   if ( mode() == CapturePoint )
   {
+    if ( e->button() != Qt::LeftButton )
+      return;
+
     //check we only use this tool for point/multipoint layers
     if ( vlayer->geometryType() != QGis::Point )
     {

Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,9 @@ void QgsMapToolAddFeature::canvasReleaseEvent( QMouseEvent * e )`
`95`	`95`	`// POINT CAPTURING`
`96`	`96`	`if ( mode() == CapturePoint )`
`97`	`97`	`{`
	`98`	`+ if ( e->button() != Qt::LeftButton )`
	`99`	`+ return;`
	`100`	`+`
`98`	`101`	`//check we only use this tool for point/multipoint layers`
`99`	`102`	`if ( vlayer->geometryType() != QGis::Point )`
`100`	`103`	`{`