From 68662561e8faae7b45e980e6db5850aae2a13976 Mon Sep 17 00:00:00 2001
From: Arjen Hiemstra <ahiemstra@heimr.nl>
Date: Mon, 10 Oct 2016 13:23:07 +0200
Subject: Return empty quality instead of None in
 QualityManager::findQualityByQualityType

Contributes to CURA-2271
---
 cura/QualityManager.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/cura/QualityManager.py b/cura/QualityManager.py
index adf2f0423b..6deea4053e 100644
--- a/cura/QualityManager.py
+++ b/cura/QualityManager.py
@@ -20,6 +20,9 @@ class QualityManager:
 
     __instance = None
 
+    def __init__(self):
+        self._empty_quality_container = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(id = "empty_quality")[0]
+
     ##  Find a quality by name for a specific machine definition and materials.
     #
     #   \param quality_name
@@ -92,7 +95,8 @@ class QualityManager:
         if not result and material_containers and len(material_containers) == 1:
             basic_materials = self._getBasicMaterials(material_containers[0])
             result = self._getFilteredContainersForStack(machine_definition, basic_materials, **criteria)
-        return result[0] if result else None
+
+        return result[0] if result else self._empty_quality_container
 
     ##  Find all suitable qualities for a combination of machine and material.
     #
-- 
cgit v1.2.3


From c6afb14a091e891b60cfb2e56bf53c19bd4c4bf9 Mon Sep 17 00:00:00 2001
From: Arjen Hiemstra <ahiemstra@heimr.nl>
Date: Mon, 10 Oct 2016 13:34:45 +0200
Subject: Return the empty container if there are no results when listing
 qualities

Contributes to CURA-2271
---
 cura/QualityManager.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cura/QualityManager.py b/cura/QualityManager.py
index 6deea4053e..a304eb1db3 100644
--- a/cura/QualityManager.py
+++ b/cura/QualityManager.py
@@ -109,6 +109,10 @@ class QualityManager:
         if not result:
             basic_materials = self._getBasicMaterials(material_container)
             result = self._getFilteredContainersForStack(machine_definition, basic_materials, **criteria)
+
+        if not result:
+            result = [ self._empty_quality_container ]
+
         return result
 
     ##  Find all quality changes for a machine.
-- 
cgit v1.2.3