From d26765fd083a3ccd35d7f2c79a7d7a9616931187 Mon Sep 17 00:00:00 2001
From: Radim Blazek <radim.blazek@gmail.com>
Date: Fri, 9 Oct 2015 09:57:14 +0200
Subject: [PATCH] [GRASS] fixed crash when adding table for existing features

---
 src/providers/grass/qgsgrassvectormaplayer.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/providers/grass/qgsgrassvectormaplayer.cpp b/src/providers/grass/qgsgrassvectormaplayer.cpp
index 6e182624cb29..21161081b76d 100644
--- 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() )