Skip to content
Permalink
Browse files

merge r10596 to version 1.0

git-svn-id: http://svn.osgeo.org/qgis/branches/Version-1_0@10597 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef
jef committed Apr 19, 2009
1 parent f14d758 commit e28c24cea4959a6444834a8f60e088daf7e9b2a8
Showing with 6 additions and 1 deletion.
  1. +6 −1 src/providers/grass/qgsgrassprovider.cpp
@@ -1149,7 +1149,12 @@ void QgsGrassProvider::closeMap( int mapId )

if ( mMaps[mapId].valid )
{
bool mapsetunset = G__getenv( "MAPSET" )==NULL || *G__getenv( "MAPSET" )==0;
if( mapsetunset )
G__setenv(( char * )"MAPSET", mMaps[mapId].mapset.toAscii().data() );
Vect_close( mMaps[mapId].map );
if( mapsetunset )
G__setenv(( char * )"MAPSET", "" );
}
mMaps[mapId].valid = false;
}
@@ -1304,7 +1309,7 @@ QgsCoordinateReferenceSystem QgsGrassProvider::crs()
struct Key_Value *projunits = G_get_projunits();
char *wkt = GPJ_grass_to_wkt( projinfo, projunits, 0, 0 );
Wkt = QString( wkt );
free( wkt );
G_free( wkt );
}

setlocale( LC_NUMERIC, oldlocale );

0 comments on commit e28c24c

Please sign in to comment.
You can’t perform that action at this time.