diff options
| author | Rachel Bryk <RachelBryk@gmail.com> | 2014-10-17 23:18:59 -0400 |
|---|---|---|
| committer | Rachel Bryk <RachelBryk@gmail.com> | 2014-10-20 14:17:19 -0400 |
| commit | a67b9a4f52b9cc92a8a6fa5c2fa8a083f3348364 (patch) | |
| tree | 4224575c7d34335ad075724bca3988dcee4707c8 /Source | |
| parent | ecaa075e6aed852d520b0734e7e8f1f4cbaf12d5 (diff) | |
Disable skip bios option if no bios files exists.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/Core/CoreParameter.cpp | 8 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/ConfigMain.cpp | 12 |
2 files changed, 16 insertions, 4 deletions
diff --git a/Source/Core/Core/CoreParameter.cpp b/Source/Core/Core/CoreParameter.cpp index 299c26219d..f172c1196d 100644 --- a/Source/Core/Core/CoreParameter.cpp +++ b/Source/Core/Core/CoreParameter.cpp @@ -323,12 +323,12 @@ bool SCoreStartupParameter::AutoSetup(EBootBS2 _BootBS2) m_strSRAM = File::GetUserPath(F_GCSRAM_IDX); if (!bWii) { - m_strBootROM = File::GetUserPath(D_GCUSER_IDX) + DIR_SEP + Region + DIR_SEP GC_IPL; - if (!File::Exists(m_strBootROM)) - m_strBootROM = File::GetSysDirectory() + GC_SYS_DIR + DIR_SEP + Region + DIR_SEP GC_IPL; - if (!bHLE_BS2) { + m_strBootROM = File::GetUserPath(D_GCUSER_IDX) + DIR_SEP + Region + DIR_SEP GC_IPL; + if (!File::Exists(m_strBootROM)) + m_strBootROM = File::GetSysDirectory() + GC_SYS_DIR + DIR_SEP + Region + DIR_SEP GC_IPL; + if (!File::Exists(m_strBootROM)) { WARN_LOG(BOOT, "Bootrom file %s not found - using HLE.", m_strBootROM.c_str()); diff --git a/Source/Core/DolphinWX/ConfigMain.cpp b/Source/Core/DolphinWX/ConfigMain.cpp index 925803d2af..d868376687 100644 --- a/Source/Core/DolphinWX/ConfigMain.cpp +++ b/Source/Core/DolphinWX/ConfigMain.cpp @@ -703,6 +703,18 @@ void CConfigMain::CreateGUIControls() // IPL settings GCSystemLang = new wxChoice(GamecubePage, ID_GC_SRAM_LNG, wxDefaultPosition, wxDefaultSize, arrayStringFor_GCSystemLang); GCAlwaysHLE_BS2 = new wxCheckBox(GamecubePage, ID_GC_ALWAYS_HLE_BS2, _("Skip BIOS")); + + if (!File::Exists(File::GetUserPath(D_GCUSER_IDX) + DIR_SEP + USA_DIR + DIR_SEP GC_IPL) && + !File::Exists(File::GetSysDirectory() + GC_SYS_DIR + DIR_SEP + USA_DIR + DIR_SEP GC_IPL) && + !File::Exists(File::GetUserPath(D_GCUSER_IDX) + DIR_SEP + JAP_DIR + DIR_SEP GC_IPL) && + !File::Exists(File::GetSysDirectory() + GC_SYS_DIR + DIR_SEP + JAP_DIR + DIR_SEP GC_IPL) && + !File::Exists(File::GetUserPath(D_GCUSER_IDX) + DIR_SEP + EUR_DIR + DIR_SEP GC_IPL) && + !File::Exists(File::GetSysDirectory() + GC_SYS_DIR + DIR_SEP + EUR_DIR + DIR_SEP GC_IPL)) + { + GCAlwaysHLE_BS2->Disable(); + GCAlwaysHLE_BS2->SetToolTip(_("Put BIOS roms in User/GC/{region}.")); + } + // Device settings // EXI Devices wxStaticText* GCEXIDeviceText[3]; |