From 16c02c85593dcf1ce64cdbc175621df77fe99e00 Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Mon, 14 Jun 2021 19:36:37 +1000 Subject: [PATCH] CDROM: Don't apply speed change delay when already changing --- src/core/cdrom.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/core/cdrom.cpp b/src/core/cdrom.cpp index 8b5665dbe..9efb662fe 100644 --- a/src/core/cdrom.cpp +++ b/src/core/cdrom.cpp @@ -1020,7 +1020,8 @@ void CDROM::ExecuteCommand(TickCount ticks_late) SendACKAndStat(); EndCommand(); - if (speed_change) + if (speed_change && m_drive_state != DriveState::SeekingImplicit && + m_drive_state != DriveState::ChangingSpeedOrTOCRead) { // if we're seeking or reading, we need to add time to the current seek/read const TickCount change_ticks = GetTicksForSpeedChange();