From b40b551198118edae043dab4fbc8df025ee1f21e Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Fri, 15 May 2009 07:50:23 +0000 Subject: [PATCH] fix some weird logic in CoreParameter.cpp git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3237 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Core/Src/CoreParameter.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Source/Core/Core/Src/CoreParameter.cpp b/Source/Core/Core/Src/CoreParameter.cpp index 2b2b54a1d4..b29cf15630 100644 --- a/Source/Core/Core/Src/CoreParameter.cpp +++ b/Source/Core/Core/Src/CoreParameter.cpp @@ -194,22 +194,24 @@ bool SCoreStartupParameter::AutoSetup(EBootBios _BootBios) CheckMemcardPath(SConfig::GetInstance().m_strMemoryCardA, Region, true); CheckMemcardPath(SConfig::GetInstance().m_strMemoryCardB, Region, false); m_strSRAM = GC_SRAM_FILE; - bHLEBios = true; if (!bWii) { m_strBios = File::GetSysDirectory() + GC_SYS_DIR + DIR_SEP + Region + DIR_SEP GC_IPL; - if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bHLEBios) + if (!bHLEBios) { - if (File::Exists(m_strBios.c_str())) - { - bHLEBios = false; - } - else + if (!File::Exists(m_strBios.c_str())) { WARN_LOG(BOOT, "BIOS file %s not found - using HLE.", m_strBios.c_str()); + bHLEBios = true; } } } + else if (bWii && !bHLEBios) + { + WARN_LOG(BOOT, "GC BIOS file will not be loaded for Wii mode."); + bHLEBios = true; + } + return true; }