Skip to content

Commit

Permalink
fix #3582
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/qgis/trunk@15490 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Mar 14, 2011
1 parent 44fedd3 commit d073c4d
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/providers/grass/qgsgrass.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ QString GRASS_EXPORT QgsGrass::openMapset( QString gisdbase, QString location, Q

// Check if the mapset is in use
QString gisBase = getenv( "GISBASE" );
if ( gisBase.isNull() ) return QObject::tr( "GISBASE is not set." );
if ( gisBase.isEmpty() ) return QObject::tr( "GISBASE is not set." );

QFileInfo fi( mapsetPath + "/WIND" );
if ( !fi.exists() )
Expand Down Expand Up @@ -1104,7 +1104,7 @@ QString GRASS_EXPORT QgsGrass::getInfo( QString info, QString gisdbase, QString
QString cmd = QgsApplication::prefixPath() + "/" QGIS_LIBEXEC_SUBDIR "/grass/modules/qgis.g.info";

arguments.append( "info=" + info );
if ( !map.isNull() )
if ( !map.isEmpty() )
{
QString opt;
switch ( type )
Expand Down Expand Up @@ -1138,8 +1138,8 @@ QgsCoordinateReferenceSystem GRASS_EXPORT QgsGrass::crs( QString gisdbase, QStri
try
{
QString wkt = QgsGrass::getInfo( "proj", gisdbase, location );
QgsDebugMsg( "wkt: " + wkt );
crs.createFromWkt( wkt );

}
catch ( QgsGrass::Exception &e )
{
Expand Down

0 comments on commit d073c4d

Please sign in to comment.