Skip to content

Commit d073c4d

Browse files
author
jef
committed
fix #3582
git-svn-id: http://svn.osgeo.org/qgis/trunk@15490 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 44fedd3 commit d073c4d

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/providers/grass/qgsgrass.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ QString GRASS_EXPORT QgsGrass::openMapset( QString gisdbase, QString location, Q
442442

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

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

11061106
arguments.append( "info=" + info );
1107-
if ( !map.isNull() )
1107+
if ( !map.isEmpty() )
11081108
{
11091109
QString opt;
11101110
switch ( type )
@@ -1138,8 +1138,8 @@ QgsCoordinateReferenceSystem GRASS_EXPORT QgsGrass::crs( QString gisdbase, QStri
11381138
try
11391139
{
11401140
QString wkt = QgsGrass::getInfo( "proj", gisdbase, location );
1141+
QgsDebugMsg( "wkt: " + wkt );
11411142
crs.createFromWkt( wkt );
1142-
11431143
}
11441144
catch ( QgsGrass::Exception &e )
11451145
{

0 commit comments

Comments
 (0)