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

[svn_qgis at osgeo.org]

Author: jef
Date: 2009-02-08 13:30:28 -0500 (Sun, 08 Feb 2009)
New Revision: 10135

Modified:
   branches/Version-1_0/src/providers/grass/qgsgrass.cpp
Log:
merge r10134 from trunk

Modified: branches/Version-1_0/src/providers/grass/qgsgrass.cpp
===================================================================
--- branches/Version-1_0/src/providers/grass/qgsgrass.cpp	2009-02-08 18:30:02 UTC (rev 10134)
+++ branches/Version-1_0/src/providers/grass/qgsgrass.cpp	2009-02-08 18:30:28 UTC (rev 10135)
@@ -89,7 +89,12 @@
   // This is set when QGIS is run from within GRASS
   // or when set explicitly by the user.
   // This value should always take precedence.
+#if WIN32
+  QString gisBase = getenv( "WINGISBASE" ) ? getenv("WINGISBASE") : getenv("GISBASE");
+  gisBase = getShortPath( gisBase );
+#else
   QString gisBase = getenv( "GISBASE" );
+#endif
 #ifdef QGISDEBUG
   qDebug( "%s:%d GRASS gisBase from GISBASE env var is: %s", __FILE__, __LINE__, gisBase.toAscii().constData() );
 #endif