fix pin/unpin diagrams when no labels

qgis · May 29, 2016 · 8e980cfed1145d05bb5fc4113b5871a8ff69fb6b · 8e980cf
1 parent d6ec868
commit 8e980cfed1145d05bb5fc4113b5871a8ff69fb6b
Unified Split

Showing with 5 additions and 1 deletion.

+5 −1 src/app/qgsmaptoollabel.cpp
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 )