GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 13:46:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

CURA-4400 merge two if statements in 1

Browse Source
This commit is contained in:
Jack Ha 2018-03-08 15:38:32 +01:00
parent 5135a972a2
commit 0d61b6652c
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cura/Settings/MachineManager.py
View File

@ -722,12 +722,9 @@ class MachineManager(QObject):
continue continue
old_value = self._global_container_stack.userChanges.getProperty(setting_key, "value") old_value = self._global_container_stack.userChanges.getProperty(setting_key, "value")
if int(old_value) >= extruder_count: if int(old_value) >= extruder_count or not self._global_container_stack.extruders[str(old_value)].isEnabled:
self._global_container_stack.userChanges.removeInstance(setting_key) self._global_container_stack.userChanges.removeInstance(setting_key)
Logger.log("d", "Reset setting [%s] because its old value [%s] is no longer valid", setting_key, old_value) Logger.log("d", "Reset setting [%s] because its old value [%s] is no longer valid", setting_key, old_value)
if not self._global_container_stack.extruders[str(old_value)].isEnabled:
self._global_container_stack.userChanges.removeInstance(setting_key)
Logger.log("d", "Reset setting [%s] because its old value [%s] is no longer valid (2)", setting_key, old_value)
## Set the amount of extruders on the active machine (global stack) ## Set the amount of extruders on the active machine (global stack)
# \param extruder_count int the number of extruders to set # \param extruder_count int the number of extruders to set