[GRASS] open full vector to get list of layers on win / G7

blazek · blazek · commit bb374f08a50c · 2015-05-29T11:35:32.000+02:00
diff --git a/src/providers/grass/qgsgrass.cpp b/src/providers/grass/qgsgrass.cpp
@@ -1014,7 +1014,13 @@ QStringList GRASS_LIB_EXPORT QgsGrass::vectorLayers( const QString& gisdbase, co
 
   G_TRY
   {
+    // TODO: With Vect_open_old_head it crashes on Windows + GRASS 7 in Vect_cidx_get_type_count() when the first
+    // type is found. Try to open full map on win for now.
+#if defined(Q_OS_WIN) && GRASS_VERSION_MAJOR >= 7
+    level = Vect_open_old( &map, ( char * ) mapName.toUtf8().data(), ( char * ) mapset.toUtf8().data() );
+#else
     level = Vect_open_old_head( &map, ( char * ) mapName.toUtf8().data(), ( char * ) mapset.toUtf8().data() );
+#endif
   }
   G_CATCH( QgsGrass::Exception &e )
   {

Original file line number	Diff line number	Diff line change
`@@ -1014,7 +1014,13 @@ QStringList GRASS_LIB_EXPORT QgsGrass::vectorLayers( const QString& gisdbase, co`
`1014`	`1014`
`1015`	`1015`	`G_TRY`
`1016`	`1016`	`{`
	`1017`	`+ // TODO: With Vect_open_old_head it crashes on Windows + GRASS 7 in Vect_cidx_get_type_count() when the first`
	`1018`	`+ // type is found. Try to open full map on win for now.`
	`1019`	`+#if defined(Q_OS_WIN) && GRASS_VERSION_MAJOR >= 7`
	`1020`	`+ level = Vect_open_old( &map, ( char * ) mapName.toUtf8().data(), ( char * ) mapset.toUtf8().data() );`
	`1021`	`+#else`
`1017`	`1022`	`level = Vect_open_old_head( &map, ( char * ) mapName.toUtf8().data(), ( char * ) mapset.toUtf8().data() );`
	`1023`	`+#endif`
`1018`	`1024`	`}`
`1019`	`1025`	`G_CATCH( QgsGrass::Exception &e )`
`1020`	`1026`	`{`