Merge pull request #8571 from Pokechu22/di-interrupts

Fix gamecube games not noticing disc changes
dolphin-emu · Aug 11, 2020 · 07a0d44 · 07a0d44
2 parents 32061c9 + 9183c0c
commit 07a0d44
Show file tree

Hide file tree

Showing 8 changed files with 187 additions and 140 deletions.
diff --git a/Source/Core/Core/Boot/Boot.cpp b/Source/Core/Core/Boot/Boot.cpp
@@ -250,8 +250,9 @@ bool CBoot::DVDReadDiscID(const DiscIO::VolumeDisc& disc, u32 output_address)
   if (!disc.Read(0, buffer.size(), buffer.data(), DiscIO::PARTITION_NONE))
     return false;
   Memory::CopyToEmu(output_address, buffer.data(), buffer.size());
-  // Clear ERROR_NO_DISKID_L, probably should check if that's currently set
-  DVDInterface::SetLowError(DVDInterface::ERROR_READY);
+  // Transition out of the DiscIdNotRead state (which the drive should be in at this point,
+  // on the assumption that this is only used for the first read)
+  DVDInterface::SetDriveState(DVDInterface::DriveState::ReadyNoReadsMade);
   return true;
 }