From f7d20204bb257f4d7813811223faed20e37bc11a Mon Sep 17 00:00:00 2001 From: JosJuice Date: Thu, 30 Apr 2015 13:29:09 +0200 Subject: [PATCH] Fix DOL crash caused by VolumeHandler removal Similar to the WAD crash (0b44d7c) but in another part of the boot code. --- Source/Core/Core/Boot/Boot_BS2Emu.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/Core/Core/Boot/Boot_BS2Emu.cpp b/Source/Core/Core/Boot/Boot_BS2Emu.cpp index cb4c70f0c4..2860d536a0 100644 --- a/Source/Core/Core/Boot/Boot_BS2Emu.cpp +++ b/Source/Core/Core/Boot/Boot_BS2Emu.cpp @@ -316,16 +316,16 @@ bool CBoot::EmulatedBS2_Wii() if (SetupWiiMemory(country_code) == false) return false; - // This is some kind of consistency check that is compared to the 0x00 - // values as the game boots. This location keep the 4 byte ID for as long - // as the game is running. The 6 byte ID at 0x00 is overwritten sometime - // after this check during booting. - DVDInterface::DVDRead(0, 0x3180, 4, true); - // Execute the apploader bool apploaderRan = false; if (DVDInterface::VolumeIsValid() && DVDInterface::GetVolume().IsWiiDisc()) { + // This is some kind of consistency check that is compared to the 0x00 + // values as the game boots. This location keep the 4 byte ID for as long + // as the game is running. The 6 byte ID at 0x00 is overwritten sometime + // after this check during booting. + DVDInterface::DVDRead(0, 0x3180, 4, true); + // Set up MSR and the BAT SPR registers. UReg_MSR& m_MSR = ((UReg_MSR&)PowerPC::ppcState.msr); m_MSR.FP = 1;