mirror of
https://github.com/qgis/QGIS.git
synced 2025-02-25 00:58:06 -05:00
apply patch #364 from GRASS TRAC by Markus Neteler
git-svn-id: http://svn.osgeo.org/qgis/trunk@9655 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
parent
88844db611
commit
a81a455340
@ -1040,7 +1040,11 @@ int QgsGrassProvider::openMap( QString gisdbase, QString location, QString mapse
|
||||
if ( level == 1 )
|
||||
{
|
||||
QgsGrass::resetError();
|
||||
Vect_build( map.map, stderr );
|
||||
#if GRASS_VERSION_MAJOR >= 6 && GRASS_VERSION_MINOR >= 4
|
||||
Vect_build( map.map );
|
||||
#else
|
||||
Vect_build( map.map, stderr );
|
||||
#endif
|
||||
|
||||
if ( QgsGrass::getError() == QgsGrass::FATAL )
|
||||
{
|
||||
@ -1520,7 +1524,11 @@ bool QgsGrassProvider::closeEdit( bool newMap )
|
||||
G__setenv(( char * ) "MAPSET", map->mapset.toAscii().data() );
|
||||
|
||||
Vect_build_partial( map->map, GV_BUILD_NONE, NULL );
|
||||
#if GRASS_VERSION_MAJOR >= 6 && GRASS_VERSION_MINOR >= 4
|
||||
Vect_build( map.map );
|
||||
#else
|
||||
Vect_build( map->map, stderr );
|
||||
#endif
|
||||
|
||||
// If a new map was created close the map and return
|
||||
if ( newMap )
|
||||
|
Loading…
x
Reference in New Issue
Block a user