Browse Source

Revert "Fix for code style checks"

CURA-5456

This reverts commit cc11e0a2425f0f5a6cb71005cdee1c92cd6736c2.
Lipu Fei 6 years ago
parent
commit
880e098031
1 changed files with 2 additions and 5 deletions
  1. 2 5
      cura/Settings/SettingOverrideDecorator.py

+ 2 - 5
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