From ad4ffaf0b6c0771d340226462958b1735b165e32 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Mon, 8 Jun 2009 12:58:09 +0000 Subject: [PATCH] fix wii menu booting: fix if you know a better way :) git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3376 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Core/Src/CoreParameter.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Source/Core/Core/Src/CoreParameter.cpp b/Source/Core/Core/Src/CoreParameter.cpp index cfb7484780..b6bed0b5e7 100644 --- a/Source/Core/Core/Src/CoreParameter.cpp +++ b/Source/Core/Core/Src/CoreParameter.cpp @@ -57,6 +57,9 @@ void SCoreStartupParameter::LoadDefaults() bJITIntegerOff = false; bJITPairedOff = false; bJITSystemRegistersOff = false; + + m_strName = "NONE"; + m_strUniqueID = "00000000"; } bool SCoreStartupParameter::AutoSetup(EBootBios _BootBios) @@ -152,20 +155,20 @@ bool SCoreStartupParameter::AutoSetup(EBootBios _BootBios) // NTSC or PAL if (pTitleID[0] == 'E' || pTitleID[0] == 'J') - { bNTSC = true; - } else - { bNTSC = false; - } bWii = true; Region = EUR_DIR; m_BootType = BOOT_WII_NAND; - m_strName = pVolume->GetName(); - m_strUniqueID = pVolume->GetUniqueID(); + if (pVolume) + { + m_strName = pVolume->GetName(); + m_strUniqueID = pVolume->GetUniqueID(); + } + delete pVolume; } else