Really fix loading small IR files

Signed-off-by: falkTX <falktx@falktx.com>
DISTRHO · Jul 10, 2023 · 11b3dff · 11b3dff
1 parent e5d08cf
commit 11b3dff
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/3rd-party/FFTConvolver b/3rd-party/FFTConvolver
diff --git a/plugins/ConvolutionReverb/TwoStageThreadedConvolver.hpp b/plugins/ConvolutionReverb/TwoStageThreadedConvolver.hpp
@@ -53,17 +53,21 @@ class TwoStageThreadedConvolver : public fftconvolver::TwoStageFFTConvolver,
 
     bool init(const fftconvolver::Sample* const ir, const size_t irLen)
     {
-        if (irLen > kTailBlockSize * 2)
+        if (fftconvolver::TwoStageFFTConvolver::init(kHeadBlockSize, kTailBlockSize, ir, irLen))
         {
-            if (! fftconvolver::TwoStageFFTConvolver::init(kHeadBlockSize, kTailBlockSize, ir, irLen))
-                return false;
-
             startThread(true);
             return true;
         }
 
-        nonThreadedConvolver = new fftconvolver::FFTConvolver();
-        return nonThreadedConvolver->init(kHeadBlockSize, ir, irLen);
+        ScopedPointer<fftconvolver::FFTConvolver> conv(new fftconvolver::FFTConvolver);
+
+        if (conv->init(kHeadBlockSize, ir, irLen))
+        {
+            nonThreadedConvolver = conv.release();
+            return true;
+        }
+
+        return false;
     }
 
     void process(const fftconvolver::Sample* const input, fftconvolver::Sample* const output, const size_t len)