mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-11-02 20:52:20 -07:00
Only update job_name to unnamed but not base_name
CURA-5367 Only update job_name to "unnamed" if it's empty. Do not change base_name.
This commit is contained in:
parent
fc116e1206
commit
98aaaba594
1 changed files with 4 additions and 5 deletions
|
|
@ -299,7 +299,7 @@ class PrintInformation(QObject):
|
||||||
|
|
||||||
def _updateJobName(self):
|
def _updateJobName(self):
|
||||||
if self._base_name == "":
|
if self._base_name == "":
|
||||||
self._job_name = ""
|
self._job_name = "unnamed"
|
||||||
self._is_user_specified_job_name = False
|
self._is_user_specified_job_name = False
|
||||||
self.jobNameChanged.emit()
|
self.jobNameChanged.emit()
|
||||||
return
|
return
|
||||||
|
|
@ -351,18 +351,17 @@ class PrintInformation(QObject):
|
||||||
if is_gcode or is_project_file or (is_empty or (self._base_name == "" and self._base_name != check_name)):
|
if is_gcode or is_project_file or (is_empty or (self._base_name == "" and self._base_name != check_name)):
|
||||||
# Only take the file name part, Note : file name might have 'dot' in name as well
|
# Only take the file name part, Note : file name might have 'dot' in name as well
|
||||||
|
|
||||||
data = ''
|
data = ""
|
||||||
try:
|
try:
|
||||||
mime_type = MimeTypeDatabase.getMimeTypeForFile(name)
|
mime_type = MimeTypeDatabase.getMimeTypeForFile(name)
|
||||||
data = mime_type.stripExtension(name)
|
data = mime_type.stripExtension(name)
|
||||||
except:
|
except:
|
||||||
Logger.log("w", "Unsupported Mime Type Database file extension")
|
Logger.log("w", "Unsupported Mime Type Database file extension %s", name)
|
||||||
data = 'unnamed'
|
|
||||||
|
|
||||||
if data is not None and check_name is not None:
|
if data is not None and check_name is not None:
|
||||||
self._base_name = data
|
self._base_name = data
|
||||||
else:
|
else:
|
||||||
self._base_name = 'unnamed'
|
self._base_name = ""
|
||||||
|
|
||||||
self._updateJobName()
|
self._updateJobName()
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue