Merge pull request #5795 from Ultimaker/fix_auto_reset_on_discard_user_changes

Fix auto-resetting settings when discarding user changes
This commit is contained in:
Lipu Fei 2019-05-31 11:18:09 +02:00 committed by GitHub
commit 6efb46c9a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -893,13 +893,6 @@ class MachineManager(QObject):
result = [] # type: List[str] result = [] # type: List[str]
for setting_instance in container.findInstances(): for setting_instance in container.findInstances():
setting_key = setting_instance.definition.key setting_key = setting_instance.definition.key
setting_enabled = self._global_container_stack.getProperty(setting_key, "enabled")
if not setting_enabled:
# A setting is not visible anymore
result.append(setting_key)
Logger.log("d", "Reset setting [%s] from [%s] because the setting is no longer enabled", setting_key, container)
continue
if not self._global_container_stack.getProperty(setting_key, "type") in ("extruder", "optional_extruder"): if not self._global_container_stack.getProperty(setting_key, "type") in ("extruder", "optional_extruder"):
continue continue