Macintosh-Tools
/
macemu
mirror of https://github.com/kanjitalk755/macemu.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix handling of nocdrom

This commit is contained in:
Seth Polsley 2020-05-25 18:55:56 -05:00
parent bebeacc895
commit 23da9e72eb
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
BasiliskII/src/cdrom.cpp
View File

@ -295,16 +295,18 @@ static bool position2msf(const cdrom_drive_info &info, uint16 postype, uint32 po
void CDROMInit(void) void CDROMInit(void)
{ {
// No drives specified in prefs? Then add defaults // No drives specified in prefs? Then add defaults
if (PrefsFindString("cdrom", 0) == NULL) if (PrefsFindString("cdrom", 0) == NULL) {
SysAddCDROMPrefs(); SysAddCDROMPrefs();
}
// Add drives specified in preferences else {
int index = 0; // Add drives specified in preferences
const char *str; int index = 0;
while ((str = PrefsFindString("cdrom", index++)) != NULL) { const char *str;
void *fh = Sys_open(str, true); while ((str = PrefsFindString("cdrom", index++)) != NULL) {
if (fh) void *fh = Sys_open(str, true);
drives.push_back(cdrom_drive_info(fh)); if (fh)
drives.push_back(cdrom_drive_info(fh));
}
} }
if (!drives.empty()) { // set to first drive by default if (!drives.empty()) { // set to first drive by default