ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7440 from JosJuice/wii-menu-1.0-region 

Never return Unknown from SConfig::GetFallbackRegion
This commit is contained in:
Léo Lam 2018-11-17 21:18:38 +01:00 committed by GitHub
parent 08f9df2461 34edcdd454
commit c56516502d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/Core/ConfigManager.cpp
View File

@ -955,7 +955,11 @@ DiscIO::Region SConfig::GetFallbackRegion()
IOS::HLE::Kernel ios;
const IOS::ES::TMDReader system_menu_tmd = ios.GetES()->FindInstalledTMD(Titles::SYSTEM_MENU);
if (system_menu_tmd.IsValid())
return system_menu_tmd.GetRegion();
{
const DiscIO::Region region = system_menu_tmd.GetRegion();
if (region != DiscIO::Region::Unknown)
return region;
}
// Fall back to PAL.
return DiscIO::Region::PAL;