From 9a46a24b199e647b8d8a4bbd3fac851f9b232d81 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 3 May 2017 13:13:09 +0200 Subject: [PATCH] Profile menu now correctly marks active qualties as checked CURA-3497 --- cura/Settings/MachineManager.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index ef16142ca7..e01c16849a 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -573,7 +573,7 @@ class MachineManager(QObject): def activeQualityName(self): if self._active_container_stack and self._global_container_stack: quality = self._global_container_stack.qualityChanges - if quality and quality != self._empty_quality_changes_container: + if quality and not isinstance(quality, type(self._empty_quality_changes_container)): return quality.getName() quality = self._active_container_stack.quality if quality: @@ -584,7 +584,7 @@ class MachineManager(QObject): def activeQualityId(self): if self._active_container_stack: quality = self._active_container_stack.qualityChanges - if quality and quality != self._empty_quality_changes_container: + if quality and not isinstance(quality, type(self._empty_quality_changes_container)): return quality.getId() quality = self._active_container_stack.quality if quality: @@ -595,7 +595,7 @@ class MachineManager(QObject): def globalQualityId(self): if self._global_container_stack: quality = self._global_container_stack.qualityChanges - if quality and quality != self._empty_quality_changes_container: + if quality and not isinstance(quality, type(self._empty_quality_changes_container)): return quality.getId() quality = self._global_container_stack.quality if quality: @@ -637,7 +637,7 @@ class MachineManager(QObject): def activeQualityChangesId(self): if self._active_container_stack: changes = self._active_container_stack.qualityChanges - if changes: + if changes and changes.getId() != "empty": return changes.getId() return ""