Skip to content

Commit

Permalink
fix ab5f06b (ouch)
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Mar 31, 2016
1 parent 0168bd5 commit c6117e0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions python/plugins/processing/algs/grass/GrassUtils.py
Expand Up @@ -89,8 +89,8 @@ def grassPath():
folder = ProcessingConfig.getSetting(GrassUtils.GRASS_FOLDER)
if folder is None:
if isWindows():
if "OSGEO4W_ROOT" in environ:
testfolder = os.path.join(unicode(environ['OSGEO4W_ROOT']), "apps", "grass")
if "OSGEO4W_ROOT" in os.environ:
testfolder = os.path.join(unicode(os.environ['OSGEO4W_ROOT']), "apps", "grass")
else:
testfolder = unicode(QgsApplication.prefixPath())
testfolder = os.path.join(testfolder, 'grass')
Expand Down
4 changes: 2 additions & 2 deletions python/plugins/processing/algs/grass7/Grass7Utils.py
Expand Up @@ -87,8 +87,8 @@ def grassPath():
folder = ProcessingConfig.getSetting(Grass7Utils.GRASS_FOLDER)
if folder is None:
if isWindows():
if "OSGEO4W_ROOT" in environ:
testfolder = os.path.join(unicode(environ['OSGEO4W_ROOT']), "apps", "grass")
if "OSGEO4W_ROOT" in os.environ:
testfolder = os.path.join(unicode(os.environ['OSGEO4W_ROOT']), "apps", "grass")
else:
testfolder = unicode(QgsApplication.prefixPath())
testfolder = os.path.join(testfolder, 'grass')
Expand Down

0 comments on commit c6117e0

Please sign in to comment.