Merge pull request #145 from wongcc966422/ghostPeakController

Fixes Ghost Peak Controller Bug
This commit is contained in:
Tobias Doerffel
2014-01-25 11:13:13 -08:00
4 changed files with 31 additions and 1 deletions

View File

@@ -81,6 +81,7 @@ PeakControllerEffect::~PeakControllerEffect()
if( idx >= 0 )
{
PeakController::s_effects.remove( idx );
engine::getSong()->removeController( m_autoController );
}
}

View File

@@ -29,6 +29,7 @@
#include "PeakController.h"
#include "peak_controller_effect_controls.h"
#include "peak_controller_effect.h"
#include "preset_preview_play_handle.h"
PeakControllerEffectControls::
@@ -66,7 +67,7 @@ void PeakControllerEffectControls::loadSettings( const QDomElement & _this )
}
m_effect->m_effectId = effectId;
if( m_effect->m_autoController )
if( m_effect->m_autoController && presetPreviewPlayHandle::isPreviewing() == false )
{
delete m_effect->m_autoController;
m_effect->m_autoController = 0;