claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/86Box/86Box

Browse Source
This commit is contained in:
OBattler
2025-07-30 15:04:39 +02:00
parent 4537db4830 911170537e
commit 2ec7fa9e06
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/config.c
View File

@@ -1396,7 +1396,7 @@ load_floppy_and_cdrom_drives(void)
cdrom_set_type(c, cdrom_get_from_internal_name("cr563_075"));
sprintf(temp, "cdrom_%02i_mke_channel", c + 1);
cdrom[c].mke_channel = !!ini_section_get_int(cat, temp, c & 3);
cdrom[c].mke_channel = ini_section_get_int(cat, temp, c & 3);
if (cdrom[c].mke_channel > 3)
cdrom[c].mke_channel = 3;

16
src/qt/qt_settingsfloppycdrom.cpp
View File

@@ -277,7 +277,7 @@ SettingsFloppyCDROM::onCDROMRowChanged(const QModelIndex &current)
int speed = cdrom_get_speed(type);
if (speed == -1) {
speed = current.siblingAtColumn(1).data(Qt::UserRole).toUInt();
ui->comboBoxSpeed->setEnabled(true);
ui->comboBoxSpeed->setEnabled((bus == CDROM_BUS_DISABLED) ? false : true);
} else
ui->comboBoxSpeed->setEnabled(false);
ui->comboBoxSpeed->setCurrentIndex(speed == 0 ? 7 : speed - 1);
@@ -414,6 +414,20 @@ SettingsFloppyCDROM::on_comboBoxBus_activated(int)
setCDROMType(ui->tableViewCDROM->model(),
ui->tableViewCDROM->selectionModel()->currentIndex(),
ui->comboBoxCDROMType->currentData().toUInt());
int speed = cdrom_get_speed(ui->comboBoxCDROMType->currentData().toUInt());
if ((speed == -1) && (bus_type != CDROM_BUS_MITSUMI)) {
speed = ui->comboBoxSpeed->currentData().toUInt();
ui->comboBoxSpeed->setEnabled(bus_type != CDROM_BUS_DISABLED);
} else {
ui->comboBoxSpeed->setEnabled(false);
if (bus_type == CDROM_BUS_MITSUMI) // temp hack
speed = 0;
}
ui->comboBoxSpeed->setCurrentIndex(speed == 0 ? 7 : speed - 1);
setCDROMSpeed(ui->tableViewCDROM->model(),
ui->tableViewCDROM->selectionModel()->currentIndex(),
speed);
emit cdromChannelChanged();
}