sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-11-27 00:07:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9207 from mbernasocchi/master

Browse Source 
Add safety guard when mDataProvider is not set
This commit is contained in:
Matthias Kuhn 2019-02-20 14:02:16 +01:00 committed by GitHub
commit ddbd06f3f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/core/auto_generated/qgsvectorlayer.sip.in
View File

@ -1507,6 +1507,8 @@ Returns the list of attributes which make up the layer's primary keys.
%Docstring
Returns feature count including changes which have not yet been committed
If you need only the count of committed features call this method on this layer's provider.
:return: the number of features on this layer or -1 if unknown.
%End
bool setReadOnly( bool readonly = true );

2
src/core/qgsvectorlayer.cpp
View File

@ -2891,6 +2891,8 @@ QgsAttributeList QgsVectorLayer::primaryKeyAttributes() const
long QgsVectorLayer::featureCount() const
{
if ( ! mDataProvider )
return -1;
return mDataProvider->featureCount() +
( mEditBuffer ? mEditBuffer->mAddedFeatures.size() - mEditBuffer->mDeletedFeatureIds.size() : 0 );
}

1
src/core/qgsvectorlayer.h
View File

@ -1397,6 +1397,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer, public QgsExpressionConte
/**
* Returns feature count including changes which have not yet been committed
* If you need only the count of committed features call this method on this layer's provider.
* \returns the number of features on this layer or -1 if unknown.
*/
long featureCount() const FINAL;