Merge branch 'master' of github.com:Ultimaker/Cura

This commit is contained in:
Mark 2017-09-08 16:35:17 +02:00
commit 41ab160e62
2 changed files with 3 additions and 2 deletions

View File

@ -265,7 +265,8 @@ class PrintInformation(QObject):
# extension. This cuts the extension off if necessary.
name = os.path.splitext(name)[0]
if self._base_name == "" and self._base_name != name:
# name is "" when I first had some meshes and afterwards I deleted them so the naming should start again
if name == "" or (self._base_name == "" and self._base_name != name):
self._base_name = name
self._updateJobName()

View File

@ -43,7 +43,7 @@ Item {
}
if (activity == false){
//When there is no mesh in the buildplate; the printJobTextField is set to an empty string so it doesn't set an empty string as a jobName (which is later used for saving the file)
PrintInformation.setJobName('')
PrintInformation.setBaseName('')
}
}