From 23da9e72ebef35f3cf67b0a443cad09ad0ee28ff Mon Sep 17 00:00:00 2001 From: Seth Polsley Date: Mon, 25 May 2020 18:55:56 -0500 Subject: [PATCH] Fix handling of nocdrom --- BasiliskII/src/cdrom.cpp | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/BasiliskII/src/cdrom.cpp b/BasiliskII/src/cdrom.cpp index 809be596..89638322 100644 --- a/BasiliskII/src/cdrom.cpp +++ b/BasiliskII/src/cdrom.cpp @@ -295,16 +295,18 @@ static bool position2msf(const cdrom_drive_info &info, uint16 postype, uint32 po void CDROMInit(void) { // No drives specified in prefs? Then add defaults - if (PrefsFindString("cdrom", 0) == NULL) + if (PrefsFindString("cdrom", 0) == NULL) { SysAddCDROMPrefs(); - - // Add drives specified in preferences - int index = 0; - const char *str; - while ((str = PrefsFindString("cdrom", index++)) != NULL) { - void *fh = Sys_open(str, true); - if (fh) - drives.push_back(cdrom_drive_info(fh)); + } + else { + // Add drives specified in preferences + int index = 0; + const char *str; + while ((str = PrefsFindString("cdrom", index++)) != NULL) { + void *fh = Sys_open(str, true); + if (fh) + drives.push_back(cdrom_drive_info(fh)); + } } if (!drives.empty()) { // set to first drive by default