[GRASS] fixed crash when adding table for existing features

blazek · blazek · commit d26765fd083a · 2015-10-09T09:57:14.000+02:00
diff --git a/src/providers/grass/qgsgrassvectormaplayer.cpp b/src/providers/grass/qgsgrassvectormaplayer.cpp
@@ -643,13 +643,13 @@ void QgsGrassVectorMapLayer::createTable( const QgsFields &fields, QString &erro
       mTableFields.append( fields[i] );
       mAttributeFields.append( fields[i] );
     }
+    mHasTable = true;
+    mKeyColumn = 0;
     insertCats( error );
     if ( !error.isEmpty() )
     {
       QgsDebugMsg( error );
     }
-    mHasTable = true;
-    mKeyColumn = 0;
   }
   QgsDebugMsg( "Table successfully created" );
 }
@@ -792,8 +792,8 @@ void QgsGrassVectorMapLayer::insertCats( QString &error )
     QgsDebugMsg( QString( "nCats = %1" ).arg( nCats ) );
     for ( int i = 0; i < nCats; i++ )
     {
-      int cat;
-      Vect_cidx_get_cat_by_index( map()->map(), cidxIndex, i, &cat, 0, 0 );
+      int cat, type, id;
+      Vect_cidx_get_cat_by_index( map()->map(), cidxIndex, i, &cat, &type, &id );
       QgsFeature feature;
       insertAttributes( cat, feature, error );
       if ( !error.isEmpty() )

Original file line number	Diff line number	Diff line change
`@@ -643,13 +643,13 @@ void QgsGrassVectorMapLayer::createTable( const QgsFields &fields, QString &erro`
`643`	`643`	`mTableFields.append( fields[i] );`
`644`	`644`	`mAttributeFields.append( fields[i] );`
`645`	`645`	`}`
	`646`	`+ mHasTable = true;`
	`647`	`+ mKeyColumn = 0;`
`646`	`648`	`insertCats( error );`
`647`	`649`	`if ( !error.isEmpty() )`
`648`	`650`	`{`
`649`	`651`	`QgsDebugMsg( error );`
`650`	`652`	`}`
`651`		`- mHasTable = true;`
`652`		`- mKeyColumn = 0;`
`653`	`653`	`}`
`654`	`654`	`QgsDebugMsg( "Table successfully created" );`
`655`	`655`	`}`
`@@ -792,8 +792,8 @@ void QgsGrassVectorMapLayer::insertCats( QString &error )`
`792`	`792`	`QgsDebugMsg( QString( "nCats = %1" ).arg( nCats ) );`
`793`	`793`	`for ( int i = 0; i < nCats; i++ )`
`794`	`794`	`{`
`795`		`- int cat;`
`796`		`- Vect_cidx_get_cat_by_index( map()->map(), cidxIndex, i, &cat, 0, 0 );`
	`795`	`+ int cat, type, id;`
	`796`	`+ Vect_cidx_get_cat_by_index( map()->map(), cidxIndex, i, &cat, &type, &id );`
`797`	`797`	`QgsFeature feature;`
`798`	`798`	`insertAttributes( cat, feature, error );`
`799`	`799`	`if ( !error.isEmpty() )`