Merge pull request #9852 from Pokechu22/wii-change-disc

DVDInterface: Fix decrypting reads clearing the drive state
dolphin-emu · Jun 29, 2021 · 3b3fb9d · 3b3fb9d
2 parents 901a4fb + e440b21
commit 3b3fb9d
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/Source/Core/Core/HW/DVD/DVDInterface.cpp b/Source/Core/Core/HW/DVD/DVDInterface.cpp
@@ -1251,7 +1251,9 @@ void PerformDecryptingRead(u32 position, u32 length, u32 output_address,
                            const DiscIO::Partition& partition, ReplyType reply_type)
 {
   DIInterruptType interrupt_type = DIInterruptType::TCINT;
-  SetDriveState(DriveState::Ready);
+
+  if (s_drive_state == DriveState::ReadyNoReadsMade)
+    SetDriveState(DriveState::Ready);
 
   const bool command_handled_by_thread =
       ExecuteReadCommand(static_cast<u64>(position) << 2, output_address, length, length, partition,