From 880e09803147e80eb7ae51127867f33d6b4a9704 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Wed, 13 Jun 2018 10:33:55 +0200 Subject: [PATCH] Revert "Fix for code style checks" CURA-5456 This reverts commit cc11e0a2425f0f5a6cb71005cdee1c92cd6736c2. --- cura/Settings/SettingOverrideDecorator.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/cura/Settings/SettingOverrideDecorator.py b/cura/Settings/SettingOverrideDecorator.py index 2a903d4a33..f14977866e 100644 --- a/cura/Settings/SettingOverrideDecorator.py +++ b/cura/Settings/SettingOverrideDecorator.py @@ -95,7 +95,7 @@ class SettingOverrideDecorator(SceneNodeDecorator): # # \return An extruder's container stack. def getActiveExtruder(self): - return None if self._extruder_stack is None else self._extruder_stack.getId() + return self._extruder_stack.getId() ## Gets the signal that emits if the active extruder changed. # @@ -154,13 +154,10 @@ class SettingOverrideDecorator(SceneNodeDecorator): # # \param extruder_stack_id The new extruder stack to print with. def setActiveExtruder(self, extruder_stack_id): - if self._extruder_stack is None or self._extruder_stack.getId() == extruder_stack_id: + if self._extruder_stack.getId() == extruder_stack_id: return global_stack = Application.getInstance().getMachineManager().activeMachine - if global_stack is None: - return - for extruder in global_stack.extruders.values(): if extruder.getId() == extruder_stack_id: self._extruder_stack = extruder