From 0844811f7d62d3cf9697ce0a84540feb48458611 Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Tue, 5 Dec 2006 10:30:41 +0000 Subject: [PATCH] fixed crash git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@431 0778d3d1-df1d-0410-868b-ea421aaaa00d --- ChangeLog | 5 +++++ src/tracks/instrument_track.cpp | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e50cb7c1c..54fb74e49 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-12-05 Tobias Doerffel + + * src/tracks/instrument_track.cpp: + integrated patch from Jean-Yves Lefort + 2006-12-04 Tobias Doerffel * Makefile.am: diff --git a/src/tracks/instrument_track.cpp b/src/tracks/instrument_track.cpp index 6a54be35a..ff02271fe 100644 --- a/src/tracks/instrument_track.cpp +++ b/src/tracks/instrument_track.cpp @@ -919,7 +919,7 @@ bool FASTCALL instrumentTrack::play( const midiTime & _start, trackContentObject * tco = getTCO( _tco_num ); tcos.push_back( tco ); bb_track = bbTrack::findBBTrack( _tco_num, eng() ); - if( !( bb_track->automationDisabled( this ) + if( bb_track != NULL && !( bb_track->automationDisabled( this ) || dynamic_cast( tco )->empty() ) ) { sendMidiTime( _start );