Merge pull request #1871 from M374LX/settings

Fix segfault
This commit is contained in:
Vesa V
2015-03-13 13:26:40 +02:00

View File

@@ -688,6 +688,12 @@ SetupDialog::SetupDialog( ConfigTabs _tab_to_open ) :
QString audioDevName =
ConfigManager::inst()->value( "mixer", "audiodev" );
if( audioDevName.length() == 0 )
{
audioDevName = Engine::mixer()->audioDevName();
ConfigManager::inst()->setValue(
"mixer", "audiodev", audioDevName );
}
m_audioInterfaces->
setCurrentIndex( m_audioInterfaces->findText( audioDevName ) );
m_audioIfaceSetupWidgets[audioDevName]->show();
@@ -771,6 +777,12 @@ SetupDialog::SetupDialog( ConfigTabs _tab_to_open ) :
QString midiDevName =
ConfigManager::inst()->value( "mixer", "mididev" );
if( midiDevName.length() == 0 )
{
midiDevName = Engine::mixer()->midiClientName();
ConfigManager::inst()->setValue(
"mixer", "mididev", midiDevName );
}
m_midiInterfaces->setCurrentIndex(
m_midiInterfaces->findText( midiDevName ) );
m_midiIfaceSetupWidgets[midiDevName]->show();