[vectorlayercache] properly copy featurerequest

qgis · Apr 19, 2013 · 4885c7b · 4885c7b
1 parent 66c8cc1
commit 4885c7b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/core/qgsfeaturerequest.h b/src/core/qgsfeaturerequest.h
@@ -77,7 +77,7 @@ class CORE_EXPORT QgsFeatureRequest
     explicit QgsFeatureRequest( QgsFeatureId fid );
     //! construct a request with rectangle filter
     explicit QgsFeatureRequest( const QgsRectangle& rect );
-
+    //! copy constructor
     QgsFeatureRequest( const QgsFeatureRequest& rh );
 
     FilterType filterType() const { return mFilter; }

diff --git a/src/core/qgsvectorlayercache.cpp b/src/core/qgsvectorlayercache.cpp
@@ -274,10 +274,10 @@ QgsFeatureIterator QgsVectorLayerCache::getFeatures( const QgsFeatureRequest &fe
   if ( requiresWriterIt && mLayer->dataProvider() )
   {
     // No index was able to satisfy the request
-    QgsFeatureRequest myRequest = QgsFeatureRequest( myRequest );
+    QgsFeatureRequest myRequest = QgsFeatureRequest( featureRequest );
 
     // Make sure if we cache the geometry, it gets fetched
-    if ( mCacheGeometry )
+    if ( mCacheGeometry && mLayer->hasGeometryType() )
       myRequest.setFlags( featureRequest.flags() & ~QgsFeatureRequest::NoGeometry );
 
     // Make sure, all the cached attributes are requested as well