hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

do not mess around with global static pointers for a single instance of patchesDialog - create a local object instead (closes #2139701)

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1772 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2008-10-18 14:59:27 +00:00
parent a8a3082265
commit 33c63d011c
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/sf2_player/sf2_player.cpp
View File

@@ -298,7 +298,6 @@ void sf2Instrument::freeFont( void )
{
cout << "Really deleting " << m_filename << endl;
printf("%d\n", sf2Instrument::s_fonts.remove( m_filename ) );
fluid_synth_sfunload( m_synth, m_fontId, TRUE );
delete m_font;
@@ -994,22 +993,17 @@ void sf2InstrumentView::showFileDialog( void )
// Single instance of the patch dialog
patchesDialog * sf2InstrumentView::s_patchDialog = NULL;
void sf2InstrumentView::showPatchDialog( void )
{
sf2Instrument * k = castModel<sf2Instrument>();
if( s_patchDialog == NULL )
{
s_patchDialog = new patchesDialog( this );
}
patchesDialog pd( this );
s_patchDialog->setup( k->m_synth, 1, k->getInstrumentTrack()->name(),
pd.setup( k->m_synth, 1, k->getInstrumentTrack()->name(),
&k->m_bankNum, &k->m_patchNum, m_patchLabel );
s_patchDialog->exec();
pd.exec();
}