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

Merge pull request #2408 from grejppi/master-remove-effect-check

Browse Source 
EffectChain: check if effect exists before removing
This commit is contained in:
Tres Finocchiaro
2015-10-26 14:49:41 -04:00
parent d17e78d5bb 0b6280d632
commit 9bd4c4f522
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/core/EffectChain.cpp
View File

@@ -133,10 +133,20 @@ void EffectChain::appendEffect( Effect * _effect )
void EffectChain::removeEffect( Effect * _effect )
{
Engine::mixer()->lock();
m_effects.erase( qFind( m_effects.begin(), m_effects.end(), _effect ) );
Engine::mixer()->unlock();
Effect ** found = qFind( m_effects.begin(), m_effects.end(), _effect );
if( found == m_effects.end() )
{
goto fail;
}
m_effects.erase( found );
Engine::mixer()->unlock();
emit dataChanged();
return;
fail:
Engine::mixer()->unlock();
}
@@ -261,8 +271,3 @@ void EffectChain::clear()
}
m_effects.clear();
}