From 78a36b2e9d719af6124608c043bc94f7833cf1c2 Mon Sep 17 00:00:00 2001 From: TomW Date: Sat, 27 Jun 2015 16:39:06 +0100 Subject: [PATCH] IOCTL CD-ROM code now returns 'not ready' when TOC can not be read. Should fix crashes in Windows 9x when CD drive empty or disc changed. --- src/cdrom-ioctl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/cdrom-ioctl.c b/src/cdrom-ioctl.c index 94a2381..4c4f61b 100644 --- a/src/cdrom-ioctl.c +++ b/src/cdrom-ioctl.c @@ -219,6 +219,8 @@ static int ioctl_ready(void) ioctl_open(0); temp=DeviceIoControl(hIOCTL,IOCTL_CDROM_READ_TOC, NULL,0,<oc,sizeof(ltoc),&size,NULL); ioctl_close(); + if (!temp) + return 0; if ((ltoc.TrackData[ltoc.LastTrack].Address[1] != toc.TrackData[toc.LastTrack].Address[1]) || (ltoc.TrackData[ltoc.LastTrack].Address[2] != toc.TrackData[toc.LastTrack].Address[2]) || (ltoc.TrackData[ltoc.LastTrack].Address[3] != toc.TrackData[toc.LastTrack].Address[3]) ||