[processing] minor fixes related to settings

volaya · volaya · commit b1570fb20ae7 · 2014-05-10T15:47:55.000+02:00
diff --git a/python/plugins/processing/core/GeoAlgorithm.py b/python/plugins/processing/core/GeoAlgorithm.py
@@ -232,7 +232,7 @@ def runPreExecutionScript(self, progress):
         self.runHookScript(scriptFile, progress)
 
     def runHookScript(self, filename, progress):
-        if not os.path.exists(filename):
+        if filename is None or not os.path.exists(filename):
             return
         try:
             script = 'import processing\n'
diff --git a/python/plugins/processing/core/ProcessingConfig.py b/python/plugins/processing/core/ProcessingConfig.py
@@ -26,7 +26,7 @@
 __revision__ = '$Format:%H$'
 
 import os.path
-from PyQt4 import QtGui
+from PyQt4 import QtGui,QtCore
 from processing.tools.system import *
 
 
@@ -150,7 +150,10 @@ def readSettings():
     @staticmethod
     def getSetting(name):
         if name in ProcessingConfig.settings.keys():
-            return ProcessingConfig.settings[name].value
+            v = ProcessingConfig.settings[name].value
+            if isinstance(v, QtCore.QPyNullVariant):
+                v = None
+            return v
         else:
             return None
 
