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

Don't access job in BatchQueue::saveBatchQueue() (fixes #4183)

Browse Source
This commit is contained in:
Flössie 2017-11-17 16:43:17 +01:00
parent 339c794359
commit 071e19bfd9
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtgui/batchqueue.cc
View File

@ -248,7 +248,7 @@ bool BatchQueue::saveBatchQueue ()
<< saveFormat.pngBits << '|' << saveFormat.pngCompression << '|'
<< saveFormat.tiffBits << '|' << saveFormat.tiffUncompressed << '|'
<< saveFormat.saveParams << '|' << entry->forceFormatOpts << '|'
<< entry->job->fastPipeline() << '|'
<< entry->fast_pipeline << '|'
<< std::endl;
}
}

17
rtgui/batchqueueentry.cc
View File

@ -29,10 +29,19 @@
bool BatchQueueEntry::iconsLoaded(false);
Glib::RefPtr<Gdk::Pixbuf> BatchQueueEntry::savedAsIcon;
BatchQueueEntry::BatchQueueEntry (rtengine::ProcessingJob* pjob, const rtengine::procparams::ProcParams& pparams, Glib::ustring fname, int prevw, int prevh, Thumbnail* thm)
: ThumbBrowserEntryBase(fname),
opreview(nullptr), origpw(prevw), origph(prevh), opreviewDone(false),
job(pjob), params(pparams), progress(0), outFileName(""), sequence(0), forceFormatOpts(false)
BatchQueueEntry::BatchQueueEntry (rtengine::ProcessingJob* pjob, const rtengine::procparams::ProcParams& pparams, Glib::ustring fname, int prevw, int prevh, Thumbnail* thm) :
ThumbBrowserEntryBase(fname),
opreview(nullptr),
origpw(prevw),
origph(prevh),
opreviewDone(false),
job(pjob),
params(pparams),
progress(0),
outFileName(""),
sequence(0),
forceFormatOpts(false),
fast_pipeline(job->fastPipeline())
{
thumbnail = thm;

1
rtgui/batchqueueentry.h
View File

@ -53,6 +53,7 @@ public:
int sequence;
SaveFormat saveFormat;
bool forceFormatOpts;
bool fast_pipeline;
BatchQueueEntry (rtengine::ProcessingJob* job, const rtengine::procparams::ProcParams& pparams, Glib::ustring fname, int prevw, int prevh, Thumbnail* thm = nullptr);
~BatchQueueEntry ();