From 0d61b6652c6ff2bebb2648685aef0b64f32ec361 Mon Sep 17 00:00:00 2001 From: Jack Ha Date: Thu, 8 Mar 2018 15:38:32 +0100 Subject: [PATCH] CURA-4400 merge two if statements in 1 --- cura/Settings/MachineManager.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 5afecb8ef5..d84b5eb3d9 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -722,12 +722,9 @@ class MachineManager(QObject): continue 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) 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) # \param extruder_count int the number of extruders to set