Merge remote-tracking branch 'upstream/stable-1.2'

# Conflicts: # data/themes/default/style.css # src/gui/ExportProjectDialog.cpp # src/tracks/Pattern.cpp
2017-08-27 13:07:45 +02:00
parent 9b5d3790b0 efd0d34f2b
commit 12edb58c77
242 changed files with 46 additions and 14 deletions
--- a/include/EnvelopeAndLfoParameters.h
+++ b/include/EnvelopeAndLfoParameters.h
@@ -121,6 +121,7 @@ private:
 	static LfoInstances * s_lfoInstances;
 	bool m_used;

+	QMutex m_paramMutex;

 	FloatModel m_predelayModel;
 	FloatModel m_attackModel;