Skip to content

Commit 36988f1

Browse files
committed
Few fixes in the attribute table model
They were triggering assertions in debug mode...
1 parent 86860ce commit 36988f1

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

src/gui/attributetable/qgsattributetablemodel.cpp

+7-3
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
QgsAttributeTableModel::QgsAttributeTableModel( QgsVectorLayerCache *layerCache, QObject *parent )
3636
: QAbstractTableModel( parent )
3737
, mLayerCache( layerCache )
38+
, mFieldCount( 0 )
3839
, mCachedField( -1 )
3940
{
4041
QgsDebugMsg( "entered." );
@@ -285,9 +286,12 @@ void QgsAttributeTableModel::loadLayer()
285286
{
286287
QgsDebugMsg( "entered." );
287288

288-
beginRemoveRows( QModelIndex(), 0, rowCount() - 1 );
289-
removeRows( 0, rowCount() );
290-
endRemoveRows();
289+
if ( rowCount() != 0 )
290+
{
291+
beginRemoveRows( QModelIndex(), 0, rowCount() - 1 );
292+
removeRows( 0, rowCount() );
293+
endRemoveRows();
294+
}
291295

292296
QgsFeatureIterator features = mLayerCache->getFeatures( mFeatureRequest );
293297

0 commit comments

Comments
 (0)