GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-09-13 15:33:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

User changes are deserialized by workspacereader if there is no machine conflict

Browse Source 
CURA-1263
This commit is contained in:
Jaime van Kessel 2016-11-25 16:17:46 +01:00
parent bde1e05273
commit ef7004fb72
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/3MFReader/ThreeMFWorkspaceReader.py
View File

@ -210,7 +210,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
if not user_containers: if not user_containers:
containers_to_add.append(instance_container) containers_to_add.append(instance_container)
else: else:
if self._resolve_strategies["machine"] == "override": if self._resolve_strategies["machine"] == "override" or self._resolve_strategies["machine"] is None:
user_containers[0].deserialize(archive.open(instance_container_file).read().decode("utf-8")) user_containers[0].deserialize(archive.open(instance_container_file).read().decode("utf-8"))
elif self._resolve_strategies["machine"] == "new": elif self._resolve_strategies["machine"] == "new":
# The machine is going to get a spiffy new name, so ensure that the id's of user settings match. # The machine is going to get a spiffy new name, so ensure that the id's of user settings match.