fix pin/unpin diagrams when no labels

pblottiere · pblottiere · commit 8e980cfed114 · 2016-05-29T17:36:21.000+02:00
diff --git a/src/app/qgsmaptoollabel.cpp b/src/app/qgsmaptoollabel.cpp
@@ -689,7 +689,11 @@ QgsMapToolLabel::LabelDetails::LabelDetails( const QgsLabelPosition& p )
   if ( layer && layer->labeling() )
   {
     settings = layer->labeling()->settings( layer, pos.providerID );
-    valid = settings.enabled;
+
+    if ( p.isDiagram )
+      valid = layer->diagramsEnabled();
+    else
+      valid = settings.enabled;
   }
 
   if ( !valid )

Original file line number	Diff line number	Diff line change
`@@ -689,7 +689,11 @@ QgsMapToolLabel::LabelDetails::LabelDetails( const QgsLabelPosition& p )`
`689`	`689`	`if ( layer && layer->labeling() )`
`690`	`690`	`{`
`691`	`691`	`settings = layer->labeling()->settings( layer, pos.providerID );`
`692`		`- valid = settings.enabled;`
	`692`	`+`
	`693`	`+ if ( p.isDiagram )`
	`694`	`+ valid = layer->diagramsEnabled();`
	`695`	`+ else`
	`696`	`+ valid = settings.enabled;`
`693`	`697`	`}`
`694`	`698`
`695`	`699`	`if ( !valid )`