Merge pull request #5099 from JosJuice/wii-menu-strings

Display nicer version strings for the Wii Menu

1 files changed, 3 insertions, 15 deletions

diff --git a/Source/Core/DiscIO/VolumeWiiCrypted.cpp b/Source/Core/DiscIO/VolumeWiiCrypted.cpp
index 4cf13ffa8f..31d13ba68b 100644
--- a/Source/Core/DiscIO/VolumeWiiCrypted.cpp
+++ b/Source/Core/DiscIO/VolumeWiiCrypted.cpp
@@ -174,22 +174,10 @@ Country CVolumeWiiCrypted::GetCountry() const
 
   const Region region = GetRegion();
 
-  if (RegionSwitchWii(country_byte) == region)
-    return CountrySwitch(country_byte);
+  if (RegionSwitchWii(country_byte) != region)
+    return TypicalCountryForRegion(region);
 
-  switch (region)
-  {
-  case Region::NTSC_J:
-    return Country::COUNTRY_JAPAN;
-  case Region::NTSC_U:
-    return Country::COUNTRY_USA;
-  case Region::PAL:
-    return Country::COUNTRY_EUROPE;
-  case Region::NTSC_K:
-    return Country::COUNTRY_KOREA;
-  default:
-    return Country::COUNTRY_UNKNOWN;
-  }
+  return CountrySwitch(country_byte);
 }
 
 std::string CVolumeWiiCrypted::GetMakerID() const