Fix deadlock when exporting is finished, if the project has any Sampl…

…e TCO(s). (LMMS#3742) [cherry-picked from stable-1.2]
sdasda7777 · Aug 2, 2017 · 6ce8ac4 · 6ce8ac4
1 parent 81469c2
commit 6ce8ac4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/include/Mixer.h b/include/Mixer.h
@@ -421,6 +421,7 @@ class EXPORT Mixer : public QObject
 
 	friend class LmmsCore;
 	friend class MixerWorkerThread;
+	friend class ProjectRenderer;
 
 } ;
 

diff --git 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
-Original file line number
+Diff line change
@@ Expand Up / @@ -421,6 +421,7 @@ class EXPORT Mixer : public QObject @@
     	friend class LmmsCore;
     	friend class MixerWorkerThread;
+    	friend class ProjectRenderer;
     } ;
@@ Expand Down @@