Don't try to open CDROM device if none was specified.
This commit is contained in:
parent
bdcf66f800
commit
f8d321c2d6
|
@ -302,11 +302,13 @@ static int CDROM_Open(HANDLE hDevice, DWORD clientID)
|
||||||
if (!cdrom_cache[dev].count)
|
if (!cdrom_cache[dev].count)
|
||||||
{
|
{
|
||||||
char root[4];
|
char root[4];
|
||||||
|
const char *device;
|
||||||
|
|
||||||
strcpy(root, "A:\\");
|
strcpy(root, "A:\\");
|
||||||
root[0] += dev;
|
root[0] += dev;
|
||||||
if (GetDriveTypeA(root) != DRIVE_CDROM) return -1;
|
if (GetDriveTypeA(root) != DRIVE_CDROM) return -1;
|
||||||
cdrom_cache[dev].fd = open(DRIVE_GetDevice(dev), O_RDONLY|O_NONBLOCK);
|
if (!(device = DRIVE_GetDevice(dev))) return -1;
|
||||||
|
cdrom_cache[dev].fd = open(device, O_RDONLY|O_NONBLOCK);
|
||||||
if (cdrom_cache[dev].fd == -1)
|
if (cdrom_cache[dev].fd == -1)
|
||||||
{
|
{
|
||||||
FIXME("Can't open configured CD-ROM drive at %s (device %s): %s\n", root, DRIVE_GetDevice(dev), strerror(errno));
|
FIXME("Can't open configured CD-ROM drive at %s (device %s): %s\n", root, DRIVE_GetDevice(dev), strerror(errno));
|
||||||
|
|
Loading…
Reference in New Issue