really fix ab5f06b (ouch again - machine mixup)

jef-n · jef-n · commit 3bfe2f14673e · 2016-03-31T23:03:03.000+02:00
diff --git a/python/plugins/processing/algs/grass/GrassUtils.py b/python/plugins/processing/algs/grass/GrassUtils.py
@@ -90,7 +90,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
@@ -88,7 +88,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')
@@ -102,7 +102,7 @@ def grassPath():
                 if not os.path.isdir(folder):
                     folder = '/Applications/GRASS-7.0.app/Contents/MacOS'
 
-        return folder
+        return folder or ''
 
     @staticmethod
     def grassWinShell():
