Skip to content

Commit 81b1c09

Browse files
author
rblazek
committed
temporal fix for 1900
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12687 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 38e183f commit 81b1c09

File tree

1 file changed

+13
-3
lines changed

1 file changed

+13
-3
lines changed

src/providers/grass/qgsgrass.cpp

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,10 @@ void GRASS_EXPORT QgsGrass::init( void )
9090
// Init GRASS libraries (required)
9191
G_no_gisinit(); // Doesn't check write permissions for mapset compare to G_gisinit("libgrass++");
9292

93+
// I think that mask should not be used in QGIS as it can only confuse people,
94+
// anyway, I don't think anybody is using MASK
95+
G_suppress_masking();
96+
9397
// Set program name
9498
G_set_program_name( "QGIS" );
9599

@@ -594,9 +598,15 @@ QString QgsGrass::closeMapset( )
594598

595599
// Reinitialize GRASS
596600
G__setenv(( char * ) "GISRC", ( char * ) "" );
597-
G__setenv(( char * ) "GISDBASE", ( char * ) "" );
598-
G__setenv(( char * ) "LOCATION_NAME", ( char * ) "" );
599-
G__setenv(( char * ) "MAPSET", ( char * ) "" );
601+
602+
// Temporarily commented because of
603+
// http://trac.osgeo.org/qgis/ticket/1900
604+
// http://trac.osgeo.org/gdal/ticket/3313
605+
// it can be uncommented once GDAL with patch gets depoyed (probably GDAL 1.8)
606+
//G__setenv(( char * ) "GISDBASE", ( char * ) "" );
607+
//G__setenv(( char * ) "LOCATION_NAME", ( char * ) "" );
608+
//G__setenv(( char * ) "MAPSET", ( char * ) "" );
609+
600610
defaultGisdbase = "";
601611
defaultLocation = "";
602612
defaultMapset = "";

0 commit comments

Comments
 (0)