From 69c8580a229c98a5cf350f27aa689d95d4e69846 Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Sat, 22 Nov 2008 21:47:37 +0000 Subject: [PATCH] fixed wrong logic in automatableModel::setValue() which led to bugs when changing linked controls to 0 (stable backport) git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/branches/lmms/stable-0.4@1846 0778d3d1-df1d-0410-868b-ea421aaaa00d --- ChangeLog | 4 ++++ src/core/automatable_model.cpp | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index b5beea6f3..c836de852 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2008-11-22 Tobias Doerffel + * src/core/automatable_model.cpp: + fixed wrong logic in automatableModel::setValue() which led to bugs when + changing linked controls to 0 + * src/gui/file_browser.cpp: do not allow to import unhandled file types, e.g. ZynAddSubFX presets if plugin is not available (closes #2326384) diff --git a/src/core/automatable_model.cpp b/src/core/automatable_model.cpp index 90462b32f..4e0c1d6d8 100644 --- a/src/core/automatable_model.cpp +++ b/src/core/automatable_model.cpp @@ -83,7 +83,7 @@ automatableModel::~automatableModel() bool automatableModel::isAutomated( void ) const { - return( automationPattern::isAutomated( this ) ); + return automationPattern::isAutomated( this ); } @@ -193,12 +193,12 @@ void automatableModel::setValue( const float _value ) it != m_linkedModels.end(); ++it ) { if( (*it)->m_setValueDepth < 1 && - !(*it)->fittedValue( m_value ) != + (*it)->fittedValue( _value ) != (*it)->m_value ) { bool journalling = (*it)->testAndSetJournalling( isJournalling() ); - (*it)->setValue( m_value ); + (*it)->setValue( _value ); (*it)->setJournalling( journalling ); } }