From 876cf8df8e0ac1a2ed4ac7cf230d24e9f808c2a6 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Tue, 16 Dec 2008 02:31:51 +0000 Subject: [PATCH] fixed crash in processAudioBuffer when notePlayHandle was NULL (crashed certain instruments like sf2) git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1936 0778d3d1-df1d-0410-868b-ea421aaaa00d --- ChangeLog | 4 ++++ src/tracks/instrument_track.cpp | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a6f892883..9d7929c24 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,10 @@ - shift drag on an unselected note didn't work (FIXED) - added a note detuning tool - fixed mouse cursor glitch when mousing over notes + + * src/tracks/instrument_track.cpp: + fixed crash in processAudioBuffer when notePlayHandle was NULL + (crashed certain instruments like sf2) 2008-12-14 Andrew Kelley diff --git a/src/tracks/instrument_track.cpp b/src/tracks/instrument_track.cpp index 42d400e1f..451a653f2 100644 --- a/src/tracks/instrument_track.cpp +++ b/src/tracks/instrument_track.cpp @@ -180,7 +180,8 @@ void instrumentTrack::processAudioBuffer( sampleFrame * _buf, _frames, ( _n != NULL ) ? _n->offset() : 0, panningToVolumeVector( - (int) m_panningModel.value() + _n->getPanning(), + (int) m_panningModel.value() + + ( _n != NULL ) ? _n->getPanning() : 0, v_scale ), &m_audioPort ); }