diff options
| author | Leo Lam <leolino.lam@gmail.com> | 2017-07-20 14:13:11 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-20 14:13:11 +0800 |
| commit | c207a1072da9ccfda727bbc740cc1a73c763aae1 (patch) | |
| tree | 83baf257749db2cda3c5e97a82f4ba9b642b3b82 /Source/Core/DiscIO/VolumeWii.cpp | |
| parent | 39e17ccc41d79b778bae4c1be9cf661842165c66 (diff) | |
| parent | c83cac7cca874de782109fdeee2990aab8606879 (diff) | |
Merge pull request #5795 from JosJuice/gc-region-detection
Improve GameCube region detection
Diffstat (limited to 'Source/Core/DiscIO/VolumeWii.cpp')
| -rw-r--r-- | Source/Core/DiscIO/VolumeWii.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/Core/DiscIO/VolumeWii.cpp b/Source/Core/DiscIO/VolumeWii.cpp index cf570e39ea..7225a1e57f 100644 --- a/Source/Core/DiscIO/VolumeWii.cpp +++ b/Source/Core/DiscIO/VolumeWii.cpp @@ -233,7 +233,10 @@ std::string VolumeWii::GetGameID(const Partition& partition) const Region VolumeWii::GetRegion() const { const std::optional<u32> region_code = m_pReader->ReadSwapped<u32>(0x4E000); - return region_code ? static_cast<Region>(*region_code) : Region::UNKNOWN_REGION; + if (!region_code) + return Region::UNKNOWN_REGION; + const Region region = static_cast<Region>(*region_code); + return region <= Region::NTSC_K ? region : Region::UNKNOWN_REGION; } Country VolumeWii::GetCountry(const Partition& partition) const |