Fixed duplicate controllers issue
This commit is contained in:
@@ -278,6 +278,8 @@ public slots:
|
||||
|
||||
void addBBTrack();
|
||||
|
||||
bool isLoadingProject();
|
||||
|
||||
|
||||
private slots:
|
||||
void insertBar();
|
||||
|
||||
@@ -30,6 +30,7 @@
|
||||
#include "peak_controller_effect_controls.h"
|
||||
#include "peak_controller_effect.h"
|
||||
#include "preset_preview_play_handle.h"
|
||||
#include "song.h"
|
||||
|
||||
|
||||
PeakControllerEffectControls::
|
||||
@@ -67,7 +68,7 @@ void PeakControllerEffectControls::loadSettings( const QDomElement & _this )
|
||||
}
|
||||
m_effect->m_effectId = effectId;
|
||||
|
||||
if( m_effect->m_autoController && presetPreviewPlayHandle::isPreviewing() == false )
|
||||
if( m_effect->m_autoController && ( engine::getSong()->isLoadingProject() == true || presetPreviewPlayHandle::isPreviewing() == false ) )
|
||||
{
|
||||
delete m_effect->m_autoController;
|
||||
m_effect->m_autoController = 0;
|
||||
|
||||
@@ -258,12 +258,7 @@ ConstNotePlayHandleList presetPreviewPlayHandle::nphsOfInstrumentTrack(
|
||||
|
||||
bool presetPreviewPlayHandle::isPreviewing()
|
||||
{
|
||||
bool ret = s_previewTC->m_dataMutex.tryLock();
|
||||
if( ret == true )
|
||||
{
|
||||
s_previewTC->m_dataMutex.unlock();
|
||||
}
|
||||
return ret;
|
||||
return s_previewTC->isPreviewing();
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -1500,6 +1500,13 @@ void song::removeController( Controller * _controller )
|
||||
|
||||
|
||||
|
||||
|
||||
bool song::isLoadingProject()
|
||||
{
|
||||
return m_loadingProject;
|
||||
}
|
||||
|
||||
|
||||
#include "moc_song.cxx"
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user