From 591d3f29ec860a940e5c1ba73a23ea26b4ca95b1 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Thu, 8 Mar 2018 15:36:12 +0100 Subject: [PATCH] CURA-4870 Don't crash when there is not buildplate variant for the current machine --- cura/Machines/VariantManager.py | 4 +++- cura/Settings/MachineManager.py | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/cura/Machines/VariantManager.py b/cura/Machines/VariantManager.py index 44ed9614f7..196c2e7b1d 100644 --- a/cura/Machines/VariantManager.py +++ b/cura/Machines/VariantManager.py @@ -132,4 +132,6 @@ class VariantManager: return node def getBuildplateVariantNode(self, machine_definition_id: str, buildplate_type: str) -> Optional["ContainerNode"]: - return self._machine_to_buildplate_dict_map[machine_definition_id].get(buildplate_type) + if machine_definition_id in self._machine_to_buildplate_dict_map: + return self._machine_to_buildplate_dict_map[machine_definition_id].get(buildplate_type) + return None diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 7b9a4191ed..aa86311259 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1068,7 +1068,10 @@ class MachineManager(QObject): if configuration.buildplateConfiguration is not None: global_variant_container_node = self._variant_manager.getBuildplateVariantNode(self._global_container_stack.definition.getId(), configuration.buildplateConfiguration) - self._setGlobalVariant(global_variant_container_node) + if global_variant_container_node: + self._setGlobalVariant(global_variant_container_node) + else: + self._global_container_stack.variant = self._empty_variant_container else: self._global_container_stack.variant = self._empty_variant_container self._updateQualityWithMaterial()