Fix feature counting

m-kuhn · m-kuhn · commit 3e88e8e9ac1d · 2017-05-11T12:42:26.000+02:00
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -703,8 +703,7 @@ bool QgsVectorLayer::countSymbolFeatures()
   if ( !mFeatureCounter )
   {
     mFeatureCounter = new QgsVectorLayerFeatureCounter( this );
-    connect( mFeatureCounter, &QgsVectorLayerFeatureCounter::symbolsCounted, this, &QgsVectorLayer::onSymbolsCounted );
-    connect( mFeatureCounter, &QgsTask::taskCompleted, [ = ]() { mFeatureCounter = nullptr; } );
+    connect( mFeatureCounter, &QgsTask::taskCompleted, [ = ]() { onSymbolsCounted(); mFeatureCounter = nullptr; } );
     connect( mFeatureCounter, &QgsTask::taskTerminated, [ = ]() { mFeatureCounter = nullptr; } );
 
     QgsApplication::taskManager()->addTask( mFeatureCounter );

Original file line number	Diff line number	Diff line change
`@@ -703,8 +703,7 @@ bool QgsVectorLayer::countSymbolFeatures()`
`703`	`703`	`if ( !mFeatureCounter )`
`704`	`704`	`{`
`705`	`705`	`mFeatureCounter = new QgsVectorLayerFeatureCounter( this );`
`706`		`- connect( mFeatureCounter, &QgsVectorLayerFeatureCounter::symbolsCounted, this, &QgsVectorLayer::onSymbolsCounted );`
`707`		`- connect( mFeatureCounter, &QgsTask::taskCompleted, [ = ]() { mFeatureCounter = nullptr; } );`
	`706`	`+ connect( mFeatureCounter, &QgsTask::taskCompleted, [ = ]() { onSymbolsCounted(); mFeatureCounter = nullptr; } );`
`708`	`707`	`connect( mFeatureCounter, &QgsTask::taskTerminated, [ = ]() { mFeatureCounter = nullptr; } );`
`709`	`708`
`710`	`709`	`QgsApplication::taskManager()->addTask( mFeatureCounter );`