3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-07 15:07:28 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Return empty extruder list if no global stack

Browse source 
Just about every call of this function (except 2) would break when this returns None. The signature also says it doesn't return None. Let's return an empty list instead.

Contributes to issue CURA-5045.
This commit is contained in:
Ghostkeeper 2018-03-27 09:28:19 +02:00
parent 6d3fed8f52
commit bd4aba2572
No known key found for this signature in database
GPG key ID: 5252B696FB5E7C7A
2 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cura/Settings/ExtruderManager.py
View file

@ -366,7 +366,7 @@ class ExtruderManager(QObject):
def getActiveExtruderStacks(self) -> List["ExtruderStack"]: def getActiveExtruderStacks(self) -> List["ExtruderStack"]:
global_stack = Application.getInstance().getGlobalContainerStack() global_stack = Application.getInstance().getGlobalContainerStack()
if not global_stack: if not global_stack:
return None return []
result = [] result = []
if global_stack.getId() in self._extruder_trains: if global_stack.getId() in self._extruder_trains:

22
cura/Settings/MachineManager.py
View file

@ -509,12 +509,11 @@ class MachineManager(QObject):
result = {} result = {}
active_stacks = ExtruderManager.getInstance().getActiveExtruderStacks() active_stacks = ExtruderManager.getInstance().getActiveExtruderStacks()
if active_stacks is not None: # If we have extruder stacks for stack in active_stacks:
for stack in active_stacks: material_container = stack.material
material_container = stack.material if not material_container:
if not material_container: continue
continue result[stack.getId()] = material_container.getId()
result[stack.getId()] = material_container.getId()
return result return result
@ -961,12 +960,11 @@ class MachineManager(QObject):
result = {} result = {}
active_stacks = ExtruderManager.getInstance().getActiveExtruderStacks() active_stacks = ExtruderManager.getInstance().getActiveExtruderStacks()
if active_stacks is not None: for stack in active_stacks:
for stack in active_stacks: variant_container = stack.variant
variant_container = stack.variant position = stack.getMetaDataEntry("position")
position = stack.getMetaDataEntry("position") if variant_container and variant_container != self._empty_variant_container:
if variant_container and variant_container != self._empty_variant_container: result[position] = variant_container.getName()
result[position] = variant_container.getName()
return result return result