From 9be61f83dfeb2ab395b374c19d40f94d119b0c84 Mon Sep 17 00:00:00 2001 From: Jonathan Li Date: Thu, 12 Oct 2017 07:20:45 +0100 Subject: [PATCH] cdvdgigaherz: Fix Q subchannel relative offset calculation The wrong comparison was used, so all the relative offsets were completely wrong. Fixes the wrong track issue in the CD player. Regression introduced in f314c2a4d9a0ab349c0357b692312c137e2e6ac6. --- plugins/cdvdGigaherz/src/CDVD.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/cdvdGigaherz/src/CDVD.cpp b/plugins/cdvdGigaherz/src/CDVD.cpp index d59fdda85b..942d1e0496 100644 --- a/plugins/cdvdGigaherz/src/CDVD.cpp +++ b/plugins/cdvdGigaherz/src/CDVD.cpp @@ -306,7 +306,7 @@ EXPORT s32 CALLBACK CDVDreadSubQ(u32 lsn, cdvdSubQ *subq) lsn_to_msf(&subq->discM, &subq->discS, &subq->discF, lsn + 150); u8 i = strack; - while (i < etrack && lsn < tracks[i + 1].start_lba) + while (i < etrack && lsn >= tracks[i + 1].start_lba) ++i; lsn -= tracks[i].start_lba;