[QGIS Commit] r10597 - branches/Version-1_0/src/providers/grass

[svn_qgis at osgeo.org]

Author: jef
Date: 2009-04-19 05:13:36 -0400 (Sun, 19 Apr 2009)
New Revision: 10597

Modified:
   branches/Version-1_0/src/providers/grass/qgsgrassprovider.cpp
Log:
merge r10596 to version 1.0

Modified: branches/Version-1_0/src/providers/grass/qgsgrassprovider.cpp
===================================================================
--- branches/Version-1_0/src/providers/grass/qgsgrassprovider.cpp	2009-04-19 09:12:29 UTC (rev 10596)
+++ branches/Version-1_0/src/providers/grass/qgsgrassprovider.cpp	2009-04-19 09:13:36 UTC (rev 10597)
@@ -1149,7 +1149,12 @@
 
     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 @@
     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 );