3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-19 12:47:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fix merge conflict

Browse source
This commit is contained in:
Aleksei S 2017-11-17 15:22:29 +01:00 • committed by ChrisTerBeke
parent dd8e5e2c6e
commit 10b5a19043
1 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cura/PrintInformation.py
View file

@ -308,6 +308,9 @@ class PrintInformation(QObject):
# name is "" when I first had some meshes and afterwards I deleted them so the naming should start again # name is "" when I first had some meshes and afterwards I deleted them so the naming should start again
is_empty = name == "" is_empty = name == ""
if is_empty or (self._base_name == "" and self._base_name != name): if is_empty or (self._base_name == "" and self._base_name != name):
# remove ".curaproject" suffix from (imported) the file name
if name.endswith(".curaproject"):
name = name[:name.rfind(".curaproject")]
self._base_name = name self._base_name = name
self._updateJobName( empty_name = is_empty) self._updateJobName( empty_name = is_empty)