diff --git a/cura/Settings/ExtruderManager.py b/cura/Settings/ExtruderManager.py index 2b422ec406..c2fe929957 100755 --- a/cura/Settings/ExtruderManager.py +++ b/cura/Settings/ExtruderManager.py @@ -366,7 +366,7 @@ class ExtruderManager(QObject): def getActiveExtruderStacks(self) -> List["ExtruderStack"]: global_stack = Application.getInstance().getGlobalContainerStack() if not global_stack: - return None + return [] result = [] if global_stack.getId() in self._extruder_trains: diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 6694bba0d6..8695252737 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -509,12 +509,11 @@ class MachineManager(QObject): result = {} active_stacks = ExtruderManager.getInstance().getActiveExtruderStacks() - if active_stacks is not None: # If we have extruder stacks - for stack in active_stacks: - material_container = stack.material - if not material_container: - continue - result[stack.getId()] = material_container.getId() + for stack in active_stacks: + material_container = stack.material + if not material_container: + continue + result[stack.getId()] = material_container.getId() return result @@ -961,12 +960,11 @@ class MachineManager(QObject): result = {} active_stacks = ExtruderManager.getInstance().getActiveExtruderStacks() - if active_stacks is not None: - for stack in active_stacks: - variant_container = stack.variant - position = stack.getMetaDataEntry("position") - if variant_container and variant_container != self._empty_variant_container: - result[position] = variant_container.getName() + for stack in active_stacks: + variant_container = stack.variant + position = stack.getMetaDataEntry("position") + if variant_container and variant_container != self._empty_variant_container: + result[position] = variant_container.getName() return result