From 04247f266499c430d283449537c17a803022d46b Mon Sep 17 00:00:00 2001 From: OBattler Date: Tue, 14 Jan 2020 20:45:20 +0100 Subject: [PATCH] The CD-ROM image code function to check if a track is audio now simply returns with a false condition if the track number obtained from the sector is -1. --- src/cdrom/cdrom_image.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/cdrom/cdrom_image.c b/src/cdrom/cdrom_image.c index 34a2dcc29..0b803eef0 100644 --- a/src/cdrom/cdrom_image.c +++ b/src/cdrom/cdrom_image.c @@ -140,7 +140,7 @@ image_is_track_audio(cdrom_t *dev, uint32_t pos, int ismsf) uint8_t attr; TMSF tmsf; int m, s, f; - int number; + int number, track; if (!img || (dev->cd_status == CD_STATUS_DATA_ONLY)) return 0; @@ -153,9 +153,13 @@ image_is_track_audio(cdrom_t *dev, uint32_t pos, int ismsf) } /* GetTrack requires LBA. */ - cdi_get_audio_track_info(img, 0, cdi_get_track(img, pos), &number, &tmsf, &attr); - - return attr == AUDIO_TRACK; + track = cdi_get_track(img, pos); + if (track == -1) + return 0; + else { + cdi_get_audio_track_info(img, 0, cdi_get_track(img, pos), &number, &tmsf, &attr); + return attr == AUDIO_TRACK; + } }