Few fixes in the attribute table model

wonder-sk · wonder-sk · commit 36988f1ac50d · 2014-06-18T20:48:13.000+07:00
They were triggering assertions in debug mode...
diff --git a/src/gui/attributetable/qgsattributetablemodel.cpp b/src/gui/attributetable/qgsattributetablemodel.cpp
@@ -35,6 +35,7 @@
 QgsAttributeTableModel::QgsAttributeTableModel( QgsVectorLayerCache *layerCache, QObject *parent )
     : QAbstractTableModel( parent )
     , mLayerCache( layerCache )
+    , mFieldCount( 0 )
     , mCachedField( -1 )
 {
   QgsDebugMsg( "entered." );
@@ -285,9 +286,12 @@ void QgsAttributeTableModel::loadLayer()
 {
   QgsDebugMsg( "entered." );
 
-  beginRemoveRows( QModelIndex(), 0, rowCount() - 1 );
-  removeRows( 0, rowCount() );
-  endRemoveRows();
+  if ( rowCount() != 0 )
+  {
+    beginRemoveRows( QModelIndex(), 0, rowCount() - 1 );
+    removeRows( 0, rowCount() );
+    endRemoveRows();
+  }
 
   QgsFeatureIterator features = mLayerCache->getFeatures( mFeatureRequest );
 
