From 31a04ed8dac85b2c536a4695659cb4d8496582e4 Mon Sep 17 00:00:00 2001 From: ChrisTerBeke Date: Fri, 20 Oct 2017 11:37:45 +0200 Subject: [PATCH] Also emit active quality changed when no dialog interaction occured - CURA-4447 --- cura/Settings/MachineManager.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 442c61d9ce..8cd793dfae 100755 --- a/cura/Settings/MachineManager.py +++ b/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.