Attribute table filter: force geometry extraction when needed

Hugo Mercier · Hugo Mercier · commit d9a10280eb1d · 2018-10-24T10:12:19.000+02:00
Fixes #18286
diff --git a/src/app/qgsattributetabledialog.cpp b/src/app/qgsattributetabledialog.cpp
@@ -1116,6 +1116,11 @@ void QgsAttributeTableDialog::setFilterExpression( const QString &filterString,
   {
     request.setFlags( QgsFeatureRequest::NoGeometry );
   }
+  else
+  {
+    // force geometry extraction if the filter requests it
+    request.setFlags( request.flags() & ~QgsFeatureRequest::NoGeometry );
+  }
   QgsFeatureIterator featIt = mLayer->getFeatures( request );
 
   QgsFeature f;

Original file line number	Diff line number	Diff line change
`@@ -1116,6 +1116,11 @@ void QgsAttributeTableDialog::setFilterExpression( const QString &filterString,`
`1116`	`1116`	`{`
`1117`	`1117`	`request.setFlags( QgsFeatureRequest::NoGeometry );`
`1118`	`1118`	`}`
	`1119`	`+ else`
	`1120`	`+ {`
	`1121`	`+ // force geometry extraction if the filter requests it`
	`1122`	`+ request.setFlags( request.flags() & ~QgsFeatureRequest::NoGeometry );`
	`1123`	`+ }`
`1119`	`1124`	`QgsFeatureIterator featIt = mLayer->getFeatures( request );`
`1120`	`1125`
`1121`	`1126`	`QgsFeature f;`