From 54fdd850d1e657bc357d859a532497905ded741a Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Tue, 19 Oct 2021 15:38:09 +0300 Subject: [PATCH] Rearrange postprocessor creation code in SequenceBuilder Previously it would have inadvertently deleted overridden postprocessors. --- source/builders/sequencebuilder.cpp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/source/builders/sequencebuilder.cpp b/source/builders/sequencebuilder.cpp index eff9348b..f007350e 100644 --- a/source/builders/sequencebuilder.cpp +++ b/source/builders/sequencebuilder.cpp @@ -74,27 +74,26 @@ void SequenceBuilder::build(Sequence &sequence) const #endif for(const SequenceTemplate::PostProcessor &p: tmpl.get_postprocessors()) { - RefPtr proc = 0; + PostProcessor *proc = 0; if(!p.slot_name.empty()) proc = get_item(postprocessors, p.slot_name); - if(proc) - sequence.add_postprocessor(*proc); - else if(p.postprocessor_template) + if(!proc) { - proc = p.postprocessor_template->create(sequence.get_width(), sequence.get_height()); - if(proc) + if(p.postprocessor_template) { + proc = p.postprocessor_template->create(sequence.get_width(), sequence.get_height()); #ifdef DEBUG if(!debug_name.empty()) proc->set_debug_name(format("%s/%d.pproc", debug_name, index++)); #endif - sequence.add_postprocessor(*proc.get()); - sequence.add_owned(proc.release()); } + else + throw invalid_operation("SequenceBuilder::build"); + + sequence.add_owned(proc); } - if(!proc) - throw invalid_operation("SequenceBuilder::build"); + sequence.add_postprocessor(*proc); } } -- 2.43.0