From bd3f024d0150a9dd69dac14a7d3a2578ca5b51dc Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Wed, 14 Sep 2022 10:08:43 -0700 Subject: [PATCH] render: check for more cancels --- app/render/renderprocessor.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/render/renderprocessor.cpp b/app/render/renderprocessor.cpp index 1e69ea2ce..92d61c041 100644 --- a/app/render/renderprocessor.cpp +++ b/app/render/renderprocessor.cpp @@ -144,6 +144,11 @@ void RenderProcessor::Run() SetCacheVideoParams(ticket_->property("vparam").value()); SetCacheAudioParams(ticket_->property("aparam").value()); + if (IsCancelled()) { + ticket_->Finish(); + return; + } + switch (type) { case RenderManager::kTypeVideo: { @@ -225,11 +230,11 @@ void RenderProcessor::Run() SampleBuffer samples = sample_val.toSamples(); if (samples.is_allocated()) { - if (ticket_->property("clamp").toBool()) { + if (ticket_->property("clamp").toBool() && !IsCancelled()) { samples.clamp(); } - if (ticket_->property("enablewaveforms").toBool()) { + if (ticket_->property("enablewaveforms").toBool() && !IsCancelled()) { AudioVisualWaveform vis; vis.set_channel_count(samples.audio_params().channel_count()); vis.OverwriteSamples(samples, samples.audio_params().sample_rate());