really fix ab5f06b (ouch again - machine mixup)

qgis · Jun 8, 2016 · 9be98ac · 9be98ac
1 parent 4904629
commit 9be98ac
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/python/plugins/processing/algs/grass/GrassUtils.py b/python/plugins/processing/algs/grass/GrassUtils.py
@@ -92,7 +92,7 @@ def grassPath():
         if folder is None:
             if isWindows():
                 if "OSGEO4W_ROOT" in os.environ:
-                    testfolder = os.path.join(unicode(os.environ['OSGEO4W_ROOT']), "apps", "grass")
+                    testfolder = os.path.join(unicode(os.environ['OSGEO4W_ROOT']), "apps")
                 else:
                     testfolder = unicode(QgsApplication.prefixPath())
                 testfolder = os.path.join(testfolder, 'grass')

diff --git a/python/plugins/processing/algs/grass7/Grass7Utils.py b/python/plugins/processing/algs/grass7/Grass7Utils.py
@@ -89,7 +89,7 @@ def grassPath():
         if folder is None:
             if isWindows():
                 if "OSGEO4W_ROOT" in os.environ:
-                    testfolder = os.path.join(unicode(os.environ['OSGEO4W_ROOT']), "apps", "grass")
+                    testfolder = os.path.join(unicode(os.environ['OSGEO4W_ROOT']), "apps")
                 else:
                     testfolder = unicode(QgsApplication.prefixPath())
                 testfolder = os.path.join(testfolder, 'grass')
@@ -103,7 +103,7 @@ def grassPath():
                 if not os.path.isdir(folder):
                     folder = '/Applications/GRASS-7.0.app/Contents/MacOS'
 
-        return folder
+        return folder or ''
 
     @staticmethod
     def grassDescriptionPath():