From 7a9e20f1b740922de31fbd4df3a798d48bf9e59e Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Thu, 5 Jun 2008 17:25:49 +0000 Subject: [PATCH] when freeing instrument-window, also free view immediately - fixes crash when removing instrument-track while instrument-track window was open git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1076 0778d3d1-df1d-0410-868b-ea421aaaa00d --- src/tracks/instrument_track.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/tracks/instrument_track.cpp b/src/tracks/instrument_track.cpp index e352b883f..6cae21694 100644 --- a/src/tracks/instrument_track.cpp +++ b/src/tracks/instrument_track.cpp @@ -200,7 +200,7 @@ void instrumentTrack::processAudioBuffer( sampleFrame * _buf, _n->framesLeftForCurrentPeriod(), _frames ) : _frames, ( _n != NULL ) ? _n->offset() : 0, - panningToVolumeVector( m_panningModel.value(), + panningToVolumeVector( (int) m_panningModel.value(), v_scale ), &m_audioPort ); } @@ -926,10 +926,11 @@ void instrumentTrackView::freeInstrumentTrackWindow( void ) { if( s_windows.count() < INSTRUMENT_WINDOW_CACHE_SIZE ) { + m_window->parentWidget()->hide(); m_window->setModel( engine::getDummyTrackContainer()-> dummyInstrumentTrack() ); - m_window->parentWidget()->hide(); + m_window->updateInstrumentView(); s_windows.enqueue( m_window ); } else