diff --git a/pcsx2/CDVD/CDVD.cpp b/pcsx2/CDVD/CDVD.cpp index 486e4d4412..526df09893 100644 --- a/pcsx2/CDVD/CDVD.cpp +++ b/pcsx2/CDVD/CDVD.cpp @@ -1271,12 +1271,12 @@ __fi void cdvdReadInterrupt() if (cdvd.CurrentRetryCnt <= cdvd.RetryCntMax) { - CDVD_LOG("CDVD read err, retrying... (attempt %d of %d)", cdvd.CurrentRetryCnt, cdvd.RetryCntMax); + ERROR_LOG("CDVD read err, retrying... (attempt {} of {})", cdvd.CurrentRetryCnt, cdvd.RetryCntMax); cdvd.ReadErr = DoCDVDreadTrack(cdvd.CurrentSector, cdvd.ReadMode); CDVDREAD_INT(cdvd.ReadTime); } else - Console.Error("CDVD READ ERROR, sector = 0x%08x", cdvd.CurrentSector); + ERROR_LOG("CDVD READ ERROR, sector = {}", cdvd.CurrentSector); return; } diff --git a/pcsx2/CDVD/InputIsoFile.cpp b/pcsx2/CDVD/InputIsoFile.cpp index 7fb11ab05e..c88d843cb7 100644 --- a/pcsx2/CDVD/InputIsoFile.cpp +++ b/pcsx2/CDVD/InputIsoFile.cpp @@ -89,8 +89,12 @@ int InputIsoFile::FinishRead3(u8* dst, uint mode) const int ret = m_reader->FinishRead(); m_read_inprogress = false; - if (ret < 0) - return ret; + if (ret <= 0) + { + m_read_lsn = -1; + m_read_count = 0; + return -1; + } } int _offset = 0;