hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge pull request #235 from wongcc966422/issue225

Browse Source 
Fixes crash on loading instrument with peak controller
This commit is contained in:
Tobias Doerffel
2014-02-02 02:45:00 -08:00
parent ed148306f0 64195eb645
commit a14b9b46ca
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/peak_controller_effect/peak_controller_effect_controls.cpp
View File

@@ -78,7 +78,7 @@ void PeakControllerEffectControls::loadSettings( const QDomElement & _this )
m_effect->m_effectId = rand();
}
if( m_effect->m_autoController && PresetPreviewPlayHandle::isPreviewing() == false )
if( m_effect->m_autoController && PresetPreviewPlayHandle::isPreviewing() == true )
{
delete m_effect->m_autoController;
m_effect->m_autoController = 0;

7
src/core/PeakController.cpp
View File

@@ -38,6 +38,7 @@
#include "EffectChain.h"
#include "ControllerDialog.h"
#include "plugins/peak_controller_effect/peak_controller_effect.h"
#include "PresetPreviewPlayHandle.h"
PeakControllerEffectVector PeakController::s_effects;
int PeakController::m_getCount;
@@ -62,7 +63,11 @@ PeakController::PeakController( Model * _parent,
PeakController::~PeakController()
{
if( m_peakEffect != NULL && m_peakEffect->effectChain() != NULL )
//EffectChain::loadSettings() appends effect to EffectChain::m_effects
//When it's previewing, EffectChain::loadSettings(<Controller Fx XML>) is not called
//Therefore, we shouldn't call removeEffect() as it is not even appended.
//NB: Most XML setting are loaded on preview, except controller fx.
if( m_peakEffect != NULL && m_peakEffect->effectChain() != NULL && PresetPreviewPlayHandle::isPreviewing() == false )
{
m_peakEffect->effectChain()->removeEffect( m_peakEffect );
}

4
src/core/PresetPreviewPlayHandle.cpp
View File

@@ -88,8 +88,8 @@ public:
bool isPreviewing()
{
bool ret = m_dataMutex.tryLock();
if( ret == true )
bool ret = !m_dataMutex.tryLock();
if( ret == false )
{
m_dataMutex.unlock();
}