Fix #10469 (symbology not refreshed after drag'n'drop)

qgis · Jun 5, 2014 · 7ef0641 · 7ef0641
1 parent 6de2cdf
commit 7ef0641
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/gui/layertree/qgslayertreemodel.cpp b/src/gui/layertree/qgslayertreemodel.cpp
@@ -511,6 +511,9 @@ void QgsLayerTreeModel::nodeLayerLoaded()
 
 void QgsLayerTreeModel::layerRendererChanged()
 {
+  if ( !testFlag( ShowSymbology ) )
+    return;
+
   QgsMapLayer* layer = qobject_cast<QgsMapLayer*>( sender() );
   if ( !layer )
     return;
@@ -543,8 +546,6 @@ void QgsLayerTreeModel::removeSymbologyFromLayer( QgsLayerTreeLayer* nodeLayer )
   {
     qDeleteAll( mSymbologyNodes[nodeLayer] );
     mSymbologyNodes.remove( nodeLayer );
-
-    disconnect( nodeLayer->layer(), SIGNAL( rendererChanged() ), this, SLOT( layerRendererChanged() ) );
   }
 }
 
@@ -566,9 +567,6 @@ void QgsLayerTreeModel::addSymbologyToLayer( QgsLayerTreeLayer* nodeL )
   {
     addSymbologyToPluginLayer( nodeL );
   }
-
-  // be ready for any subsequent changes of the renderer
-  connect( nodeL->layer(), SIGNAL( rendererChanged() ), this, SLOT( layerRendererChanged() ) );
 }
 
 
@@ -689,6 +687,8 @@ void QgsLayerTreeModel::connectToLayer( QgsLayerTreeLayer* nodeLayer )
   }
 
   QgsMapLayer* layer = nodeLayer->layer();
+  connect( layer, SIGNAL( rendererChanged() ), this, SLOT( layerRendererChanged() ), Qt::UniqueConnection );
+
   if ( layer->type() == QgsMapLayer::VectorLayer )
   {
     // using unique connection because there may be temporarily more nodes for a layer than just one