From 983e963dd3a209fe3a7a0ffee1a17946eda603d1 Mon Sep 17 00:00:00 2001 From: Simon Edwards Date: Thu, 22 Sep 2016 11:58:37 +0200 Subject: [PATCH] Fix for deleting quality changes profiles. Contributes to CURA-2414 Quality changes profiles are created incorrectly --- cura/QualityManager.py | 2 +- cura/Settings/ContainerManager.py | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/cura/QualityManager.py b/cura/QualityManager.py index 1ef79f2b86..45c4eec543 100644 --- a/cura/QualityManager.py +++ b/cura/QualityManager.py @@ -57,7 +57,7 @@ class QualityManager: return self._getFilteredContainersForStack(machine_definition, material_containers, **criteria) def _getFilteredContainers(self, **kwargs): - return self._getFilteredContainersForStack(None, None **kwargs) + return self._getFilteredContainersForStack(None, None, **kwargs) def _getFilteredContainersForStack(self, machine_definition=None, material_containers=None, **kwargs): # Fill in any default values. diff --git a/cura/Settings/ContainerManager.py b/cura/Settings/ContainerManager.py index 2b4f8553ba..cb5dcd070b 100644 --- a/cura/Settings/ContainerManager.py +++ b/cura/Settings/ContainerManager.py @@ -502,7 +502,12 @@ class ContainerManager(QObject): activate_quality = quality_name == self._machine_manager.activeQualityName activate_quality_type = None - for container in self._getFilteredContainers(name = quality_name, type = "quality_changes"): + global_stack = UM.Application.getInstance().getGlobalContainerStack() + if not global_stack or not quality_name: + return "" + machine_definition = global_stack.getBottom() + + for container in QualityManager.getInstance().findQualityChangesByName(quality_name, machine_definition, []): containers_found = True if activate_quality and not activate_quality_type: activate_quality_type = container.getMetaDataEntry("quality")