Browse Source

Merge current quality_changes values into newly created profiles

Creating a profile with a custom profile as the active profile would ignore the settings of that custom profile.

CURA-2565
fieldOfView 8 years ago
parent
commit
081ca8ea8d
1 changed files with 4 additions and 2 deletions
  1. 4 2
      cura/Settings/ContainerManager.py

+ 4 - 2
cura/Settings/ContainerManager.py

@@ -480,6 +480,7 @@ class ContainerManager(QObject):
             new_changes = self._createQualityChanges(quality_container, unique_name,
                                                      UM.Application.getInstance().getGlobalContainerStack().getBottom(),
                                                      extruder_id)
+            self._performMerge(new_changes, quality_changes_container, clear_settings = False)
             self._performMerge(new_changes, user_container)
 
             self._container_registry.addContainer(new_changes)
@@ -694,7 +695,7 @@ class ContainerManager(QObject):
     def createContainerManager(engine, js_engine):
         return ContainerManager.getInstance()
 
-    def _performMerge(self, merge_into, merge):
+    def _performMerge(self, merge_into, merge, clear_settings = True):
         assert isinstance(merge, type(merge_into))
 
         if merge == merge_into:
@@ -703,7 +704,8 @@ class ContainerManager(QObject):
         for key in merge.getAllKeys():
             merge_into.setProperty(key, "value", merge.getProperty(key, "value"))
 
-        merge.clear()
+        if clear_settings:
+            merge.clear()
 
     def _updateContainerNameFilters(self):
         self._container_name_filters = {}