Reversed %p and %P processing cases for location templates, which were opposite to what the help says.

This commit is contained in:
Scott Gilbertson 2024-01-07 11:49:19 -05:00
parent 0127b68bdb
commit c918de3178

View File

@ -915,7 +915,7 @@ Glib::ustring BatchQueue::calcAutoFileNameBase (const Glib::ustring& origFileNam
if (options.savePathTemplate[ix] == '%') { if (options.savePathTemplate[ix] == '%') {
ix++; ix++;
if (options.savePathTemplate[ix] == 'p') { if (options.savePathTemplate[ix] == 'P') {
// insert path elements from given index to the end // insert path elements from given index to the end
ix++; ix++;
unsigned n = decodePathIndex(ix, options.savePathTemplate, da.size()); unsigned n = decodePathIndex(ix, options.savePathTemplate, da.size());
@ -929,7 +929,7 @@ Glib::ustring BatchQueue::calcAutoFileNameBase (const Glib::ustring& origFileNam
if (ix < options.savePathTemplate.size() && options.savePathTemplate[ix] != '/' && options.savePathTemplate[ix] != '\\') { if (ix < options.savePathTemplate.size() && options.savePathTemplate[ix] != '/' && options.savePathTemplate[ix] != '\\') {
ix--; ix--;
} }
} else if (options.savePathTemplate[ix] == 'P') { } else if (options.savePathTemplate[ix] == 'p') {
// insert path elements from the start of the path up to the given index // insert path elements from the start of the path up to the given index
ix++; ix++;
unsigned n = decodePathIndex(ix, options.savePathTemplate, da.size()); unsigned n = decodePathIndex(ix, options.savePathTemplate, da.size());