Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Ultimaker/Cura.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksei S <a.sasin@ultimaker.com>2017-11-17 17:22:29 +0300
committerChrisTerBeke <c.terbeke@ultimaker.com>2017-11-20 19:56:54 +0300
commit10b5a19043d730431cb68d346f02df56452d67b8 (patch)
treebbda90a7504b5deaa9548f4577bac9b94c2c3cfb /cura/PrintInformation.py
parentdd8e5e2c6e83581137e5dc13910b299b96ac669e (diff)
Fix merge conflict
Diffstat (limited to 'cura/PrintInformation.py')
-rw-r--r--cura/PrintInformation.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/cura/PrintInformation.py b/cura/PrintInformation.py
index 3e1ed2f8fa..3353cc176e 100644
--- a/cura/PrintInformation.py
+++ b/cura/PrintInformation.py
@@ -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
is_empty = 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._updateJobName( empty_name = is_empty)