From 0396717d3eb4a62bab4f03ec187a2c29192b63e8 Mon Sep 17 00:00:00 2001 From: Javier Serrano Polo Date: Sat, 22 Jul 2006 03:25:45 +0000 Subject: [PATCH] - added check to avoid segfaults when closing the application - reverted processMidiTime(), that processing is needed git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@252 0778d3d1-df1d-0410-868b-ea421aaaa00d --- src/tracks/automation_pattern.cpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/tracks/automation_pattern.cpp b/src/tracks/automation_pattern.cpp index 70333ba08..d4d56db2b 100644 --- a/src/tracks/automation_pattern.cpp +++ b/src/tracks/automation_pattern.cpp @@ -96,12 +96,11 @@ automationPattern::~automationPattern() m_track->removeAutomationPattern( this ); } - if( eng()->getAutomationEditor()->currentPattern() == this ) + if( eng()->getAutomationEditor() + && eng()->getAutomationEditor()->currentPattern() == this ) { eng()->getAutomationEditor()->setCurrentPattern( NULL ); } - - m_time_map.clear(); } @@ -254,13 +253,10 @@ const QString automationPattern::name( void ) void automationPattern::processMidiTime( const midiTime & _time ) { - if( m_time_map.size() > 1 ) + timeMap::iterator it = m_time_map.find( _time ); + if( it != m_time_map.end() ) { - timeMap::iterator it = m_time_map.find( _time ); - if( it != m_time_map.end() ) - { - m_object->setLevel( it.data() ); - } + m_object->setLevel( it.data() ); } }