From cc11e0a2425f0f5a6cb71005cdee1c92cd6736c2 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 12 Jun 2018 10:50:08 +0200 Subject: [PATCH] Fix for code style checks CURA-5456 --- cura/Settings/SettingOverrideDecorator.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cura/Settings/SettingOverrideDecorator.py b/cura/Settings/SettingOverrideDecorator.py index f14977866e..2a903d4a33 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 self._extruder_stack.getId() + return None if self._extruder_stack is None else self._extruder_stack.getId() ## Gets the signal that emits if the active extruder changed. # @@ -154,10 +154,13 @@ class SettingOverrideDecorator(SceneNodeDecorator): # # \param extruder_stack_id The new extruder stack to print with. def setActiveExtruder(self, extruder_stack_id): - if self._extruder_stack.getId() == extruder_stack_id: + if self._extruder_stack is None or 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