Merge pull request #26 from Cacodemon345/patch-33

Don't unmount ZIP and MO drives on settings save
This commit is contained in:
Joakim L. Gilje
2021-12-12 11:34:36 +01:00
committed by GitHub
2 changed files with 8 additions and 3 deletions

View File

@@ -131,8 +131,15 @@ void SettingsFloppyCDROM::save() {
/* Removable devices category */
model = ui->tableViewCDROM->model();
memset(cdrom, 0, sizeof(cdrom));
for (int i = 0; i < CDROM_NUM; i++) {
cdrom[i].img_fp = NULL;
cdrom[i].priv = NULL;
cdrom[i].ops = NULL;
cdrom[i].image = NULL;
cdrom[i].insert = NULL;
cdrom[i].close = NULL;
cdrom[i].get_volume = NULL;
cdrom[i].get_channel = NULL;
cdrom[i].bus_type = model->index(i, 0).data(Qt::UserRole).toUInt();
cdrom[i].res = model->index(i, 0).data(Qt::UserRole + 1).toUInt();
cdrom[i].speed = model->index(i, 1).data(Qt::UserRole).toUInt();

View File

@@ -128,7 +128,6 @@ SettingsOtherRemovable::~SettingsOtherRemovable()
void SettingsOtherRemovable::save() {
auto* model = ui->tableViewMO->model();
memset(mo_drives, 0, sizeof(mo_drives));
for (int i = 0; i < MO_NUM; i++) {
mo_drives[i].f = NULL;
mo_drives[i].priv = NULL;
@@ -138,7 +137,6 @@ void SettingsOtherRemovable::save() {
}
model = ui->tableViewZIP->model();
memset(zip_drives, 0, sizeof(zip_drives));
for (int i = 0; i < ZIP_NUM; i++) {
zip_drives[i].f = NULL;
zip_drives[i].priv = NULL;