Merge pull request #1578 from skidau/Fix-Fast-Disc-Speed

Fixed the fast disc speed option (immediately service the interrupt instead of going through the scheduler).

1 files changed, 13 insertions, 2 deletions

diff --git a/Source/Core/Core/HW/DVDInterface.cpp b/Source/Core/Core/HW/DVDInterface.cpp
index 825c9bce8a..95c26c5fb3 100644
--- a/Source/Core/Core/HW/DVDInterface.cpp
+++ b/Source/Core/Core/HW/DVDInterface.cpp
@@ -1046,8 +1046,19 @@ void ExecuteCommand()
 		break;
 	}
 
-	// The transfer is finished after a delay
-	CoreTiming::ScheduleEvent((int)ticks_until_TC, tc);
+	if (ticks_until_TC)
+	{
+		// The transfer is finished after a delay
+		CoreTiming::ScheduleEvent((int)ticks_until_TC, tc);
+	}
+	else
+	{
+		// transfer is done
+		m_DICR.TSTART = 0;
+		m_DILENGTH.Length = 0;
+		GenerateDIInterrupt(INT_TCINT);
+		g_ErrorCode = 0;
+	}
 }
 
 // Simulates the timing aspects of reading data from a disc.