Don't show label properties dialog for diagrams

nyalldawson · nyalldawson · commit 6ccfbbae485d · 2015-04-09T17:51:02.000+10:00
diff --git a/src/app/qgsmaptoolchangelabelproperties.cpp b/src/app/qgsmaptoolchangelabelproperties.cpp
@@ -33,7 +33,7 @@ void QgsMapToolChangeLabelProperties::canvasPressEvent( QMouseEvent *e )
 {
   deleteRubberBands();
 
-  if ( !labelAtPosition( e, mCurrentLabelPos ) )
+  if ( !labelAtPosition( e, mCurrentLabelPos ) || mCurrentLabelPos.isDiagram )
   {
     return;
   }

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ void QgsMapToolChangeLabelProperties::canvasPressEvent( QMouseEvent *e )`
`33`	`33`	`{`
`34`	`34`	`deleteRubberBands();`
`35`	`35`
`36`		`- if ( !labelAtPosition( e, mCurrentLabelPos ) )`
	`36`	`+ if ( !labelAtPosition( e, mCurrentLabelPos ) \|\| mCurrentLabelPos.isDiagram )`
`37`	`37`	`{`
`38`	`38`	`return;`
`39`	`39`	`}`