Merge branch 'options-device-selection' of https://github.com/gh2k/fractorium

This commit is contained in:
mfeemster 2015-03-21 16:14:37 -07:00
commit d69c83d5b0

View File

@ -136,6 +136,9 @@ void FractoriumOptionsDialog::OnPlatformComboCurrentIndexChanged(int index)
for (size_t i = 0; i < devices.size(); i++)
ui.DeviceCombo->addItem(QString::fromStdString(devices[i]));
if (ui.PlatformCombo->currentIndex() == m_Settings->PlatformIndex())
ui.DeviceCombo->setCurrentIndex(m_Settings->DeviceIndex());
}
/// <summary>