--- qsampler/trunk/src/qsamplerInstrumentForm.cpp 2007/11/21 09:30:35 1503 +++ qsampler/trunk/src/qsamplerInstrumentForm.cpp 2007/11/21 11:46:40 1504 @@ -44,7 +44,9 @@ } #endif -InstrumentForm::InstrumentForm(QWidget* parent) : QDialog(parent) { +InstrumentForm::InstrumentForm ( QWidget* pParent ) + : QDialog(pParent) +{ ui.setupUi(this); // Initialize locals. @@ -96,9 +98,12 @@ SLOT(reject())); } -InstrumentForm::~InstrumentForm() { + +InstrumentForm::~InstrumentForm (void) +{ } + // Channel dialog setup formal initializer. void InstrumentForm::setup ( qsamplerInstrument *pInstrument ) { @@ -189,9 +194,10 @@ Qt::MatchExactly | Qt::MatchCaseSensitive) < 0) { ui.EngineNameComboBox->addItem(sEngineName); } - ui.EngineNameComboBox->setItemText( - ui.EngineNameComboBox->currentIndex(), - sEngineName); + ui.EngineNameComboBox->setCurrentIndex( + ui.EngineNameComboBox->findText(sEngineName, + Qt::MatchExactly | Qt::MatchCaseSensitive)); + // Instrument filename and index... QString sInstrumentFile = m_pInstrument->instrumentFile(); if (sInstrumentFile.isEmpty())