From 3c80a079a27f503e56675bcd172cec867a4f8c75 Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Tue, 7 Jul 2009 01:42:22 +0200 Subject: [PATCH] InstrumentTrack: fixed muting of frozen patterns in BB tracks In InstrumentTrack::play(...) the local variable "bb_track" always was either undefined or NULL due to a lost call (probably during M/V architecture switch) to bbTrack::findBBTrack(...). This could lead to crashes and/or misbehaviour when playing frozen patterns in BB tracks. Signed-off-by: Tobias Doerffel (cherry picked from commit fb58dc00ab3d14cd9a633ca7f53d3e50ed958661) --- src/tracks/instrument_track.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tracks/instrument_track.cpp b/src/tracks/instrument_track.cpp index 5755a6950..b4d1f2d8b 100644 --- a/src/tracks/instrument_track.cpp +++ b/src/tracks/instrument_track.cpp @@ -570,17 +570,17 @@ bool instrumentTrack::play( const midiTime & _start, const float frames_per_tick = engine::framesPerTick(); tcoVector tcos; - bbTrack * bb_track; + bbTrack * bb_track = NULL; if( _tco_num >= 0 ) { trackContentObject * tco = getTCO( _tco_num ); tcos.push_back( tco ); + bb_track = bbTrack::findBBTrack( _tco_num ); } else { getTCOsInRange( tcos, _start, _start + static_cast( _frames / frames_per_tick ) ); - bb_track = NULL; } // Handle automation: detuning