3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 22:54:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Resolve strategy is now always set

Browse source 
CURA-1263
This commit is contained in:
Jaime van Kessel 2016-11-14 17:50:54 +01:00
parent 8640b2b787
commit bade9e1bff
1 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
plugins/3MFReader/ThreeMFWorkspaceReader.py
View file

@ -55,7 +55,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
archive = zipfile.ZipFile(file_name, "r") archive = zipfile.ZipFile(file_name, "r")
cura_file_names = [name for name in archive.namelist() if name.startswith("Cura/")] cura_file_names = [name for name in archive.namelist() if name.startswith("Cura/")]
container_stack_files = [name for name in cura_file_names if name.endswith(self._container_stack_suffix)] container_stack_files = [name for name in cura_file_names if name.endswith(self._container_stack_suffix)]
self._resolve_strategies = {"machine": None, "quality_changes": None}
machine_conflict = False machine_conflict = False
quality_changes_conflict = False quality_changes_conflict = False
for container_stack_file in container_stack_files: for container_stack_file in container_stack_files:
@ -89,7 +89,6 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
return WorkspaceReader.PreReadResult.cancelled return WorkspaceReader.PreReadResult.cancelled
result = self._dialog.getResult() result = self._dialog.getResult()
self._resolve_strategies = {"machine": None, "quality_changes": None}
if machine_conflict: if machine_conflict:
self._resolve_strategies["machine"] = result self._resolve_strategies["machine"] = result
if quality_changes_conflict: if quality_changes_conflict: