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

Merge pull request #5237 from lvreclp/batchque_file_overwrite

Browse Source 
Fixed file overwrite from queued items
This commit is contained in:
Beep6581
2019-03-24 21:03:39 +01:00
committed by GitHub
parent a749047dd3 d2e6a3a44a
commit ddd9cd979a
5 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rtgui/batchqueue.cc
View File

@@ -345,7 +345,7 @@ bool BatchQueue::loadBatchQueue ()
auto prevw = prevh;
thumb->getThumbnailSize (prevw, prevh, &pparams);
auto entry = new BatchQueueEntry (job, pparams, source, prevw, prevh, thumb);
auto entry = new BatchQueueEntry (job, pparams, source, prevw, prevh, thumb, options.overwriteOutputFile);
thumb->decreaseRef (); // Removing the refCount acquired by cacheMgr->getEntry
entry->setParent (this);
@@ -942,7 +942,7 @@ Glib::ustring BatchQueue::autoCompleteFileName (const Glib::ustring& fileName, c
// In overwrite mode we TRY to delete the old file first.
// if that's not possible (e.g. locked by viewer, R/O), we revert to the standard naming scheme
bool inOverwriteMode = options.overwriteOutputFile;
bool inOverwriteMode = processing->overwriteFile;
for (int tries = 0; tries < 100; tries++) {
if (tries == 0) {