Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2025-02-16 19:05:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CDROM: Don't restart play/read when current == target

Browse source 
Fixes CDDA locking up Buster Bros. Collection.
This commit is contained in:
Connor McLaughlin 2020-05-20 02:05:17 +10:00
parent 5d46556b7d
commit 415880fc40
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/core/cdrom.cpp
View file

@ -764,12 +764,12 @@ void CDROM::ExecuteCommand()
{ {
SendACKAndStat(); SendACKAndStat();
if (!m_setloc_pending && if ((!m_setloc_pending || m_setloc_position.ToLBA() == m_current_lba) &&
(m_drive_state == DriveState::Reading || (m_drive_state == DriveState::Reading ||
((m_drive_state == DriveState::SeekingPhysical || m_drive_state == DriveState::SeekingLogical) && ((m_drive_state == DriveState::SeekingPhysical || m_drive_state == DriveState::SeekingLogical) &&
m_read_after_seek))) m_read_after_seek)))
{ {
Log_DevPrintf("Ignoring read command with no setloc, already reading/reading after seek"); Log_DevPrintf("Ignoring read command with no/same setloc, already reading/reading after seek");
} }
else else
{ {
@ -794,12 +794,12 @@ void CDROM::ExecuteCommand()
{ {
SendACKAndStat(); SendACKAndStat();
if (!m_setloc_pending && track == 0 && if (track == 0 && (!m_setloc_pending || m_setloc_position.ToLBA() == m_current_lba) &&
(m_drive_state == DriveState::Playing || (m_drive_state == DriveState::Playing ||
((m_drive_state == DriveState::SeekingPhysical || m_drive_state == DriveState::SeekingLogical) && ((m_drive_state == DriveState::SeekingPhysical || m_drive_state == DriveState::SeekingLogical) &&
m_play_after_seek))) m_play_after_seek)))
{ {
Log_DevPrintf("Ignoring play command with no setloc/track, already playing/playing after seek"); Log_DevPrintf("Ignoring play command with no/same setloc, already playing/playing after seek");
} }
else else
{ {