Skip to content

Commit 126bb08

Browse files
author
jef
committed
merge r10134 from trunk
git-svn-id: http://svn.osgeo.org/qgis/branches/Version-1_0@10135 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 43882fa commit 126bb08

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

src/providers/grass/qgsgrass.cpp

+5
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,12 @@ void GRASS_EXPORT QgsGrass::init( void )
8989
// This is set when QGIS is run from within GRASS
9090
// or when set explicitly by the user.
9191
// This value should always take precedence.
92+
#if WIN32
93+
QString gisBase = getenv( "WINGISBASE" ) ? getenv("WINGISBASE") : getenv("GISBASE");
94+
gisBase = getShortPath( gisBase );
95+
#else
9296
QString gisBase = getenv( "GISBASE" );
97+
#endif
9398
#ifdef QGISDEBUG
9499
qDebug( "%s:%d GRASS gisBase from GISBASE env var is: %s", __FILE__, __LINE__, gisBase.toAscii().constData() );
95100
#endif

0 commit comments

Comments
 (0)