fix to grassWinShell

qgis · Jun 8, 2016 · e94c24d9f6cf3b9d148c1cbeca1246643434bfb1 · e94c24d
1 parent 9be98ac
commit e94c24d9f6cf3b9d148c1cbeca1246643434bfb1
Unified Split

Showing with 2 additions and 2 deletions.

+2 −2 python/plugins/processing/algs/grass/GrassUtils.py
diff --git a/python/plugins/processing/algs/grass/GrassUtils.py b/python/plugins/processing/algs/grass/GrassUtils.py
@@ -113,10 +113,10 @@ def grassWinShell():
         folder = ProcessingConfig.getSetting(GrassUtils.GRASS_WIN_SHELL) or ''
         if not os.path.exists(folder):
             folder = None
-        if folder is None:
+        if folder is None and GrassUtils.grassPath():
             folder = os.path.dirname(unicode(QgsApplication.prefixPath()))
             folder = os.path.join(folder, 'msys')
-        return folder
+        return folder or ''
 
     @staticmethod
     def grassDescriptionPath():