Browse Source

Also emit active quality changed when no dialog interaction occured - CURA-4447

ChrisTerBeke 7 years ago
parent
commit
31a04ed8da
1 changed files with 4 additions and 1 deletions
  1. 4 1
      cura/Settings/MachineManager.py

+ 4 - 1
cura/Settings/MachineManager.py

@@ -858,9 +858,11 @@ class MachineManager(QObject):
             for stack in name_changed_connect_stacks:
                 stack.nameChanged.connect(self._onQualityNameChanged)
 
+            has_user_interaction = False
+
             if self.hasUserSettings and Preferences.getInstance().getValue("cura/active_mode") == 1:
                 # Show the keep/discard user settings dialog
-                Application.getInstance().discardOrKeepProfileChanges()
+                has_user_interaction = Application.getInstance().discardOrKeepProfileChanges()
             else:
                 # If the user doesn't have any of adjusted settings then slicing will be triggered by emit()
                 # Send emits that are postponed in replaceContainer.
@@ -868,6 +870,7 @@ class MachineManager(QObject):
                 for setting_info in new_quality_settings_list:
                     setting_info["stack"].sendPostponedEmits()
 
+            if not has_user_interaction:
                 self.activeQualityChanged.emit()
 
     ##  Determine the quality and quality changes settings for the current machine for a quality name.