80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Fix 8514/A and GUS checkboxes not being grayed out with 8-bit ISA-only machines as intended (#2364)

Browse Source
This commit is contained in:
Alexander Babikov
2022-05-24 22:27:26 +05:00
committed by GitHub
parent 825141621f
commit 8baf1e3a78
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/qt/qt_settingsdisplay.cpp
View File

@@ -115,7 +115,7 @@ void SettingsDisplay::on_comboBoxVideo_currentIndexChanged(int index) {
} }
ui->pushButtonConfigureVoodoo->setEnabled(machineHasPci && ui->checkBoxVoodoo->isChecked()); ui->pushButtonConfigureVoodoo->setEnabled(machineHasPci && ui->checkBoxVoodoo->isChecked());
bool hasIsa16 = machine_has_bus(machineId, MACHINE_BUS_ISA | MACHINE_AT) > 0; bool hasIsa16 = machine_has_bus(machineId, MACHINE_BUS_ISA16) > 0;
bool has_MCA = machine_has_bus(machineId, MACHINE_BUS_MCA) > 0; bool has_MCA = machine_has_bus(machineId, MACHINE_BUS_MCA) > 0;
ui->checkBox8514->setEnabled(hasIsa16 || has_MCA); ui->checkBox8514->setEnabled(hasIsa16 || has_MCA);
if (hasIsa16 || has_MCA) { if (hasIsa16 || has_MCA) {

2
src/qt/qt_settingssound.cpp
View File

@@ -144,7 +144,7 @@ void SettingsSound::onCurrentMachineChanged(int machineId) {
ui->checkBoxFloat32->setChecked(sound_is_float > 0); ui->checkBoxFloat32->setChecked(sound_is_float > 0);
bool hasIsa = machine_has_bus(machineId, MACHINE_BUS_ISA) > 0; bool hasIsa = machine_has_bus(machineId, MACHINE_BUS_ISA) > 0;
bool hasIsa16 = machine_has_bus(machineId, MACHINE_BUS_ISA) > 0; bool hasIsa16 = machine_has_bus(machineId, MACHINE_BUS_ISA16) > 0;
ui->checkBoxCMS->setEnabled(hasIsa); ui->checkBoxCMS->setEnabled(hasIsa);
ui->pushButtonConfigureCMS->setEnabled((GAMEBLASTER > 0) && hasIsa); ui->pushButtonConfigureCMS->setEnabled((GAMEBLASTER > 0) && hasIsa);
ui->checkBoxGUS->setEnabled(hasIsa16); ui->checkBoxGUS->setEnabled(hasIsa16);