From ef7004fb72ded7a89c86f25f69fa348cf589ad3d Mon Sep 17 00:00:00 2001
From: Jaime van Kessel <nallath@gmail.com>
Date: Fri, 25 Nov 2016 16:17:46 +0100
Subject: [PATCH] User changes are deserialized by workspacereader if there is
 no machine conflict

CURA-1263
---
 plugins/3MFReader/ThreeMFWorkspaceReader.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/3MFReader/ThreeMFWorkspaceReader.py b/plugins/3MFReader/ThreeMFWorkspaceReader.py
index 79f2399cf7..6f52f74f26 100644
--- a/plugins/3MFReader/ThreeMFWorkspaceReader.py
+++ b/plugins/3MFReader/ThreeMFWorkspaceReader.py
@@ -210,7 +210,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
                 if not user_containers:
                     containers_to_add.append(instance_container)
                 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"))
                     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.