Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DVDInterface: Fix decrypting reads clearing the drive state #9852

Merged
merged 1 commit into from Jun 29, 2021

Conversation

Pokechu22
Copy link
Contributor

@Pokechu22 Pokechu22 commented Jun 28, 2021

This broke ejecting Wii discs while the game is running, as the drive state was set to Ready even when no disc was present, but other code still reported the missing disc, which confused games as you can't be both ready to read and have no disc. That would cause games to show an unrecoverable error screen, instead of a "please insert the game disc" screen.

This only affected Wii games; the GameCube games used regular disc reads which worked fine.

This issue was introduced in #8571. Oops. I only noticed it now when testing #9848.

Tested with a few different Wii games (Kirby's Dream Collection, NSMBW, Kirby's Epic Yarn), and also with some GameCube games (Paper Mario: TTYD, and the GameCube Preview Disc). I tested by ejecting the disc while the game was running, and then using change disc with the wrong disc, and then ejecting again and switching back to the correct disc; normal gameplay should resume. (The Viewtiful Joe demo on the Preview Disc lost its background music after doing this, but I confirmed that that also happens on console. That doesn't apply to the music for the preview disc menu, which does come back after reinserting the correct disc.)

This broke ejecting Wii discs while the game is running, as the drive state was set to Ready even when no disc was present, but other code still reported the missing disc, which confused games as you can't be both ready to read and have no disc.  That would cause games to show an unrecoverable error screen, instead of a "please insert the game disc" screen.

This only affected Wii games; the GameCube games used regular disc reads which worked fine.
@Tilka Tilka merged commit 3b3fb9d into dolphin-emu:master Jun 29, 2021
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
3 participants