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

Never return Unknown from SConfig::GetFallbackRegion
dolphin-emu · Nov 17, 2018 · c565165 · c565165
2 parents 08f9df2 + 34edcdd
commit c565165
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/Source/Core/Core/ConfigManager.cpp b/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;