From e12acb81100874e974445fbeb9740d9f6783397c Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 14 Sep 2016 11:44:08 +0200 Subject: [PATCH] We now remove all material containers instead of the active machine variant CURA-2210 --- resources/qml/Preferences/MaterialsPage.qml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/resources/qml/Preferences/MaterialsPage.qml b/resources/qml/Preferences/MaterialsPage.qml index ef57b5af58..25156c03be 100644 --- a/resources/qml/Preferences/MaterialsPage.qml +++ b/resources/qml/Preferences/MaterialsPage.qml @@ -242,7 +242,14 @@ UM.ManagementPage object: base.currentItem != null ? base.currentItem.name : "" onYes: { - var containers = Cura.ContainerManager.findInstanceContainers({"id": base.currentItem.id}) + // A material container can actually be multiple items, so we need to find (and remove) all of them. + var base_file = Cura.ContainerManager.getContainerMetaDataEntry(base.currentItem.id, "base_file") + if(base_file == "") + { + base_file = base.currentItem.id + } + var guid = Cura.ContainerManager.getContainerMetaDataEntry(base.currentItem.id, "GUID") + var containers = Cura.ContainerManager.findInstanceContainers({"GUID": guid, "base_file": base_file, "type": "material"}) for(var i in containers) { Cura.ContainerManager.removeContainer(containers[i])