File tree Expand file tree Collapse file tree 1 file changed +7
-3
lines changed Expand file tree Collapse file tree 1 file changed +7
-3
lines changed Original file line number Diff line number Diff line change @@ -723,10 +723,14 @@ QgsFeatureIterator QgsProcessingFeatureSource::getFeatures( const QgsFeatureRequ
723723
724724QgsFeatureSource::FeatureAvailability QgsProcessingFeatureSource::hasFeatures () const
725725{
726- if ( !mTransformErrorCallback && !mInvalidGeometryCallback && mInvalidGeometryCheck == QgsFeatureRequest::GeometryNoCheck )
727- return mSource ->hasFeatures ();
726+ FeatureAvailability sourceAvailability = mSource ->hasFeatures ();
727+ if ( sourceAvailability == NoFeaturesAvailable )
728+ return NoFeaturesAvailable; // never going to be features if underlying source has no features
729+ else if ( mInvalidGeometryCheck == QgsFeatureRequest::GeometryNoCheck )
730+ return sourceAvailability;
728731 else
729- return QgsFeatureSource::FeaturesMaybeAvailable;
732+ // we don't know... source has features, but these may be filtered out by invalid geometry check
733+ return FeaturesMaybeAvailable;
730734}
731735
732736QgsFeatureIterator QgsProcessingFeatureSource::getFeatures ( const QgsFeatureRequest &request ) const
You can’t perform that action at this time.
0 commit comments