From 08e64dc637312bcf6c2de0eb3236f787456d37fb Mon Sep 17 00:00:00 2001 From: Hyunjin Song Date: Wed, 2 Aug 2017 14:56:28 +0900 Subject: [PATCH] Fix deadlock when exporting is finished, if the project has any Sample TCO(s). (#3742) --- include/Mixer.h | 1 + src/core/ProjectRenderer.cpp | 3 +++ 2 files changed, 4 insertions(+) diff --git a/include/Mixer.h b/include/Mixer.h index 18510f363..8368e8434 100644 --- a/include/Mixer.h +++ b/include/Mixer.h @@ -421,6 +421,7 @@ private: friend class LmmsCore; friend class MixerWorkerThread; + friend class ProjectRenderer; } ; diff --git a/src/core/ProjectRenderer.cpp b/src/core/ProjectRenderer.cpp index 3c16bce96..7588401c2 100644 --- a/src/core/ProjectRenderer.cpp +++ b/src/core/ProjectRenderer.cpp @@ -201,6 +201,9 @@ void ProjectRenderer::run() } } + // notify mixer of the end of processing + Engine::mixer()->stopProcessing(); + Engine::getSong()->stopExport(); // if the user aborted export-process, the file has to be deleted