Browse Source

Merge branch 'CURA-6497_fix_empty_material_name' of github.com:Ultimaker/Cura into 4.1

Jaime van Kessel 5 years ago
parent
commit
5ae103964a

+ 1 - 1
cura/Machines/MachineErrorChecker.py

@@ -168,7 +168,7 @@ class MachineErrorChecker(QObject):
             if validator_type:
                 validator = validator_type(key)
                 validation_state = validator(stack)
-        if validation_state in (ValidatorState.Exception, ValidatorState.MaximumError, ValidatorState.MinimumError):
+        if validation_state in (ValidatorState.Exception, ValidatorState.MaximumError, ValidatorState.MinimumError, ValidatorState.Invalid):
             # Finish
             self._setResult(True)
             return

+ 1 - 1
plugins/CuraEngineBackend/StartSliceJob.py

@@ -107,7 +107,7 @@ class StartSliceJob(Job):
 
         for key in stack.getAllKeys():
             validation_state = stack.getProperty(key, "validationState")
-            if validation_state in (ValidatorState.Exception, ValidatorState.MaximumError, ValidatorState.MinimumError):
+            if validation_state in (ValidatorState.Exception, ValidatorState.MaximumError, ValidatorState.MinimumError, ValidatorState.Invalid):
                 Logger.log("w", "Setting %s is not valid, but %s. Aborting slicing.", key, validation_state)
                 return True
             Job.yieldThread()

+ 2 - 0
resources/qml/Settings/SettingTextField.qml

@@ -42,6 +42,7 @@ SettingItem
             }
             switch(propertyProvider.properties.validationState)
             {
+                case "ValidatorState.Invalid":
                 case "ValidatorState.Exception":
                 case "ValidatorState.MinimumError":
                 case "ValidatorState.MaximumError":
@@ -65,6 +66,7 @@ SettingItem
             }
             switch(propertyProvider.properties.validationState)
             {
+                case "ValidatorState.Invalid":
                 case "ValidatorState.Exception":
                 case "ValidatorState.MinimumError":
                 case "ValidatorState.MaximumError":