GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-19 16:19:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

CURA-4606 CURA-5002 fix crash with machine with variants, but no variants defined

Browse Source
This commit is contained in:
Jack Ha 2018-02-22 09:20:33 +01:00
parent f946f62db1
commit 3591e01b25
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cura/Machines/MaterialManager.py
View File

@ -256,8 +256,9 @@ class MaterialManager(QObject):
material_id_metadata_dict = dict() material_id_metadata_dict = dict()
for node in nodes_to_check: for node in nodes_to_check:
if node is not None: if node is not None:
material_id_metadata_dict = {mid: node for mid, node in node.material_map.items()} for material_id, node in node.material_map.items():
break if material_id not in material_id_metadata_dict:
material_id_metadata_dict[material_id] = node
return material_id_metadata_dict return material_id_metadata_dict

2
cura/Machines/VariantManager.py
View File

@ -83,4 +83,4 @@ class VariantManager:
def getVariantNodes(self, machine: "GlobalStack", def getVariantNodes(self, machine: "GlobalStack",
variant_type: Optional[str] = VariantType.NOZZLE) -> dict: variant_type: Optional[str] = VariantType.NOZZLE) -> dict:
machine_definition_id = machine.definition.getId() machine_definition_id = machine.definition.getId()
return self._machine_to_variant_dict_map[machine_definition_id].get(variant_type, {}) return self._machine_to_variant_dict_map.get(machine_definition_id, {}).get(variant_type, {})