From 844a597e082e00a98002984ba741493004560a69 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Fri, 2 Mar 2018 09:28:25 +0100 Subject: [PATCH] Fix materials models --- cura/Machines/Models/BrandMaterialsModel.py | 4 ++++ cura/Machines/Models/GenericMaterialsModel.py | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/cura/Machines/Models/BrandMaterialsModel.py b/cura/Machines/Models/BrandMaterialsModel.py index f6430b39da..6628d924f1 100644 --- a/cura/Machines/Models/BrandMaterialsModel.py +++ b/cura/Machines/Models/BrandMaterialsModel.py @@ -73,6 +73,10 @@ class BrandMaterialsModel(ListModel): if global_stack is None: self.setItems([]) return + extruder_position = str(self._extruder_position) + if extruder_position not in global_stack.extruders: + self.setItems([]) + return extruder_stack = global_stack.extruders[str(self._extruder_position)] available_material_dict = self._material_manager.getAvailableMaterialsForMachineExtruder(global_stack, diff --git a/cura/Machines/Models/GenericMaterialsModel.py b/cura/Machines/Models/GenericMaterialsModel.py index f5b18adde9..d20fc05b6e 100644 --- a/cura/Machines/Models/GenericMaterialsModel.py +++ b/cura/Machines/Models/GenericMaterialsModel.py @@ -25,7 +25,11 @@ class GenericMaterialsModel(BaseMaterialsModel): if global_stack is None: self.setItems([]) return - extruder_stack = global_stack.extruders[str(self._extruder_position)] + extruder_position = str(self._extruder_position) + if extruder_position not in global_stack.extruders: + self.setItems([]) + return + extruder_stack = global_stack.extruders[extruder_position] available_material_dict = self._material_manager.getAvailableMaterialsForMachineExtruder(global_stack, extruder_stack)