From 8baf1e3a78716c7ffe88c4ae43c9097f081a3dfb Mon Sep 17 00:00:00 2001 From: Alexander Babikov Date: Tue, 24 May 2022 22:27:26 +0500 Subject: [PATCH] Fix 8514/A and GUS checkboxes not being grayed out with 8-bit ISA-only machines as intended (#2364) --- src/qt/qt_settingsdisplay.cpp | 2 +- src/qt/qt_settingssound.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qt/qt_settingsdisplay.cpp b/src/qt/qt_settingsdisplay.cpp index 089232a94..84963e833 100644 --- a/src/qt/qt_settingsdisplay.cpp +++ b/src/qt/qt_settingsdisplay.cpp @@ -115,7 +115,7 @@ void SettingsDisplay::on_comboBoxVideo_currentIndexChanged(int index) { } 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; ui->checkBox8514->setEnabled(hasIsa16 || has_MCA); if (hasIsa16 || has_MCA) { diff --git a/src/qt/qt_settingssound.cpp b/src/qt/qt_settingssound.cpp index 6b12023a6..56391569a 100644 --- a/src/qt/qt_settingssound.cpp +++ b/src/qt/qt_settingssound.cpp @@ -144,7 +144,7 @@ void SettingsSound::onCurrentMachineChanged(int machineId) { ui->checkBoxFloat32->setChecked(sound_is_float > 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->pushButtonConfigureCMS->setEnabled((GAMEBLASTER > 0) && hasIsa); ui->checkBoxGUS->setEnabled(hasIsa16);