Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-29 09:05:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CDROM: Cancel command second response when queuing new command

Browse source 
Fixes Wipeout corrupting parts of the TOC.
This commit is contained in:
Connor McLaughlin 2021-08-18 00:25:15 +10:00
parent e45f15ef41
commit 18241978ea
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/core/cdrom.cpp
View file

@ -908,9 +908,21 @@ void CDROM::BeginCommand(Command command)
s_command_info[static_cast<u8>(command)].name);
// subtract the currently-elapsed ack ticks from the new command
const TickCount elapsed_ticks = m_command_event->GetInterval() - m_command_event->GetTicksUntilNextExecution();
ack_delay = std::max(ack_delay - elapsed_ticks, 1);
m_command_event->Deactivate();
if (m_command_event->IsActive())
{
const TickCount elapsed_ticks = m_command_event->GetInterval() - m_command_event->GetTicksUntilNextExecution();
ack_delay = std::max(ack_delay - elapsed_ticks, 1);
m_command_event->Deactivate();
}
}
if (m_command_second_response != Command::None)
{
Log_WarningPrintf("Cancelling pending command 0x%02X (%s) second response",
static_cast<u16>(m_command_second_response),
s_command_info[static_cast<u16>(m_command_second_response)].name);
ClearCommandSecondResponse();
}
m_command = command;