From a1b3eaffb70b55c705beee8049f51091ba525c53 Mon Sep 17 00:00:00 2001 From: skidau Date: Thu, 3 May 2012 23:32:32 +1000 Subject: [PATCH] Reverted the ES changes from r0fc390b55226. Fixes the crash that occurred when loading a channel from the sysmenu. --- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp index e5e00d3726..ae389d7b69 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp @@ -739,7 +739,6 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress) { _dbg_assert_(WII_IPC_ES, Buffer.NumberInBuffer == 2); bool bSuccess = false; - bool reloadIOS = false; u16 IOSv = 0xffff; u64 TitleID = Memory::Read_U64(Buffer.InBuffer[0].m_Address); @@ -776,14 +775,13 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress) // Lie to mem about loading a different ios // someone with an affected game should test IOSv = TitleID & 0xffff; - reloadIOS = true; } if (!bSuccess) { PanicAlertT("IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available in your nand dump\n" "TitleID %016llx.\n Dolphin will likely hang now", TitleID); } - else if (reloadIOS) + else { std::string tContentFile(m_ContentFile.c_str()); WII_IPC_HLE_Interface::Reset(true);