Fix rule based renderer shows 0 count on first click of "show counts"

nyalldawson · nyalldawson · commit 1c225b7b9c27 · 2016-10-06T21:49:22.000+10:00
(cherry-picked from 291f7bd)
diff --git a/src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp b/src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp
@@ -517,8 +517,6 @@ void QgsRuleBasedRendererV2Widget::countFeatures()
     countMap[rule].duplicateCount = 0;
   }
 
-  QgsFeatureRequest req = QgsFeatureRequest().setFilterExpression( mRenderer->filter( mLayer->fields() ) );
-
   QgsRenderContext renderContext;
   renderContext.setRendererScale( 0 ); // ignore scale
 
@@ -538,10 +536,11 @@ void QgsRuleBasedRendererV2Widget::countFeatures()
   context << QgsExpressionContextUtils::layerScope( mLayer );
 
   renderContext.setExpressionContext( context );
-  req.setExpressionContext( context );
 
   mRenderer->startRender( renderContext, mLayer->fields() );
-
+  // QgsRuleBasedRenderer::filter must be called after startRender
+  QgsFeatureRequest req = QgsFeatureRequest().setFilterExpression( mRenderer->filter( mLayer->fields() ) );
+  req.setExpressionContext( context );
   req.setSubsetOfAttributes( mRenderer->usedAttributes(), mLayer->fields() );
   QgsFeatureIterator fit = mLayer->getFeatures( req );
 
