Permalink
Browse files

Never return Unknown from SConfig::GetFallbackRegion

This happens if Wii Menu 1.0 is installed.

Reported by https://forums.dolphin-emu.org/Thread-default-case-should-not-be-reached
  • Loading branch information...
JosJuice committed Sep 30, 2018
1 parent 61821b0 commit 34edcdd45461030c286a02661ee1faf5a4caf636
Showing with 5 additions and 1 deletion.
  1. +5 −1 Source/Core/Core/ConfigManager.cpp
@@ -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;

0 comments on commit 34edcdd

Please sign in to comment.