From 2417705dfd6f99ebcaa4d7516ebfc4367fd155cb Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 19 Aug 2019 11:42:52 +0200 Subject: [PATCH] Prevent crashes when duplicating a material CURA-6600 --- cura/Machines/VariantManager.py | 2 +- plugins/XmlMaterialProfile/XmlMaterialProfile.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cura/Machines/VariantManager.py b/cura/Machines/VariantManager.py index c80545145f..9c074dcf17 100644 --- a/cura/Machines/VariantManager.py +++ b/cura/Machines/VariantManager.py @@ -115,7 +115,7 @@ class VariantManager: variant_type: Optional["VariantType"] = None) -> Optional["ContainerNode"]: if variant_type is None: variant_node = None - variant_type_dict = self._machine_to_variant_dict_map[machine_definition_id] + variant_type_dict = self._machine_to_variant_dict_map.get("machine_definition_id", {}) for variant_dict in variant_type_dict.values(): if variant_name in variant_dict: variant_node = variant_dict[variant_name] diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index 2ab9e701eb..157d871d54 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -244,7 +244,10 @@ class XmlMaterialProfile(InstanceContainer): variant_name = container.getMetaDataEntry("variant_name") if variant_name: - variant_dict = {"variant_node": variant_manager.getVariantNode(definition_id, variant_name), + variant_node = variant_manager.getVariantNode(definition_id, variant_name) + if variant_node is None: + continue + variant_dict = {"variant_node":variant_node , "material_container": container} machine_variant_map[definition_id][variant_name] = variant_dict continue