Merge branch 'master' of github.com:qgis/Quantum-GIS

qgis · Oct 2, 2012 · 101cc38 · 101cc38
2 parents 88e3e34 + 6369196
commit 101cc38
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/python/plugins/sextante/modeler/ModelerParametersDialog.py b/python/plugins/sextante/modeler/ModelerParametersDialog.py
@@ -428,12 +428,13 @@ def setParamValues(self):
                 return False
         for output in outputs:
             if output.hidden:
-                continue
-            name= unicode(self.valueItems[output.name].text())
-            if name.strip()!="" and name != ModelerParametersDialog.ENTER_NAME:
-                self.outputs[output.name]=name
+               self.outputs[output.name] = None
             else:
-                self.outputs[output.name] = None
+                name= unicode(self.valueItems[output.name].text())
+                if name.strip()!="" and name != ModelerParametersDialog.ENTER_NAME:
+                    self.outputs[output.name]=name
+                else:
+                    self.outputs[output.name] = None
         return True