Make model editor dialog more robust while loading models

qgis · Jul 8, 2017 · 0836c60 · 0836c60
1 parent 9d04f87
commit 0836c60
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/python/plugins/processing/gui/wrappers.py b/python/plugins/processing/gui/wrappers.py
@@ -177,7 +177,10 @@ def setComboValue(self, value, combobox=None):
         if combobox is None:
             combobox = self.widget
         if isinstance(value, list):
-            value = value[0]
+            if value:
+                value = value[0]
+            else:
+                value = None
         values = [combobox.itemData(i) for i in range(combobox.count())]
         try:
             idx = values.index(value)

diff --git a/python/plugins/processing/modeler/ModelerParametersDialog.py b/python/plugins/processing/modeler/ModelerParametersDialog.py
@@ -251,11 +251,14 @@ def setPreviousValues(self):
             for param in alg.algorithm().parameterDefinitions():
                 if param.isDestination() or param.flags() & QgsProcessingParameterDefinition.FlagHidden:
                     continue
+                value = None
                 if param.name() in alg.parameterSources():
                     value = alg.parameterSources()[param.name()]
                     if isinstance(value, list) and len(value) == 1:
                         value = value[0]
-                else:
+                    elif isinstance(value, list) and len(value) == 0:
+                        value = None
+                if value is None:
                     value = param.defaultValue()
 
                 if isinstance(value, QgsProcessingModelAlgorithm.ChildParameterSource) and value.source() == QgsProcessingModelAlgorithm.ChildParameterSource.StaticValue: