liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Eliminated dateTimeIsValid, instead null-checking dateTime -- non-null means it's valid.

Browse Source
This commit is contained in:
Scott Gilbertson
2024-02-19 11:43:04 -05:00
parent b39ab15659
commit 7c67739b9d
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rtgui/batchqueue.cc
View File

@@ -1021,7 +1021,6 @@ Glib::ustring BatchQueue::calcAutoFileNameBase (const Glib::ustring& origFileNam
// Insert formatted date/time value. Character after 't' defines time source // Insert formatted date/time value. Character after 't' defines time source
if (++ix < options.savePathTemplate.size()) { if (++ix < options.savePathTemplate.size()) {
Glib::DateTime dateTime; Glib::DateTime dateTime;
bool dateTimeIsValid = true;
switch(options.savePathTemplate[ix++]) switch(options.savePathTemplate[ix++])
{ {
case 'E': // (approximate) time when export started case 'E': // (approximate) time when export started
@@ -1029,15 +1028,11 @@ Glib::ustring BatchQueue::calcAutoFileNameBase (const Glib::ustring& origFileNam
break; break;
case 'F': // time when file was last saved case 'F': // time when file was last saved
{ {
dateTimeIsValid = false; // becomes true below if no errors
Glib::RefPtr<Gio::File> file = Gio::File::create_for_path(origFileName); Glib::RefPtr<Gio::File> file = Gio::File::create_for_path(origFileName);
if (file) { if (file) {
Glib::RefPtr<Gio::FileInfo> info = file->query_info("time::modified"); Glib::RefPtr<Gio::FileInfo> info = file->query_info("time::modified");
if (info) { if (info) {
dateTime = info->get_modification_date_time(); dateTime = info->get_modification_date_time();
if (dateTime) {
dateTimeIsValid = true;
}
} }
} }
} }
@@ -1049,10 +1044,9 @@ Glib::ustring BatchQueue::calcAutoFileNameBase (const Glib::ustring& origFileNam
} }
break; break;
default: default:
dateTimeIsValid = false;
break; break;
} }
if (dateTimeIsValid) { if (dateTime) {
appendFormattedTime(path, ix, options.savePathTemplate, dateTime); appendFormattedTime(path, ix, options.savePathTemplate, dateTime);
} }
} }