From 0fa96df81883410de5cafebae728578832ccc652 Mon Sep 17 00:00:00 2001 From: Pokechu22 Date: Mon, 13 Apr 2020 15:01:51 -0700 Subject: [PATCH] Remove DriveState::DiscChangeDetected hack Since both GameCube and Wii resets now work correctly, this hack is not needed anymore. --- Source/Core/Core/HW/DVD/DVDInterface.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Source/Core/Core/HW/DVD/DVDInterface.cpp b/Source/Core/Core/HW/DVD/DVDInterface.cpp index ae9bc7189e..6cdbe46bde 100644 --- a/Source/Core/Core/HW/DVD/DVDInterface.cpp +++ b/Source/Core/Core/HW/DVD/DVDInterface.cpp @@ -855,11 +855,7 @@ void ExecuteCommand(ReplyType reply_type) case 0x40: // Read DiscID INFO_LOG(DVDINTERFACE, "Read DiscID: buffer %08x", s_DIMAR); - // TODO: It doesn't make sense to include DiscChangeDetected here, as it implies that the - // drive is not spinning and reading the disc ID shouldn't change it. However, the Wii Menu - // breaks without it. - if (s_drive_state == DriveState::DiscIdNotRead || - s_drive_state == DriveState::DiscChangeDetected) + if (s_drive_state == DriveState::DiscIdNotRead) { SetDriveState(DriveState::ReadyNoReadsMade); }