[processing] Extra check to ensure GRASS folder setting not already None

- Update to 5131e93; not sure why ProcessingConfig.getSetting returning None sets folder = None instead of '' (on the previous line on Win)
qgis · Apr 26, 2016 · 36a820e · 36a820e
1 parent 4c02997
commit 36a820e
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
@@ -87,7 +87,7 @@ def grassPath():
             return ''
 
         folder = ProcessingConfig.getSetting(GrassUtils.GRASS_FOLDER) or ''
-        if not os.path.exists(folder):
+        if folder and not os.path.exists(folder):
             folder = None
         if folder is None:
             if isWindows():
@@ -111,7 +111,7 @@ def grassPath():
     @staticmethod
     def grassWinShell():
         folder = ProcessingConfig.getSetting(GrassUtils.GRASS_WIN_SHELL) or ''
-        if not os.path.exists(folder):
+        if folder and not os.path.exists(folder):
             folder = None
         if folder is None:
             folder = os.path.dirname(unicode(QgsApplication.prefixPath()))

diff --git a/python/plugins/processing/algs/grass7/Grass7Utils.py b/python/plugins/processing/algs/grass7/Grass7Utils.py
@@ -84,7 +84,7 @@ def grassPath():
             return ''
 
         folder = ProcessingConfig.getSetting(Grass7Utils.GRASS_FOLDER) or ''
-        if not os.path.exists(folder):
+        if folder and not os.path.exists(folder):
             folder = None
         if folder is None:
             if isWindows():