diff options
| author | JosJuice <josjuice@gmail.com> | 2019-03-22 20:47:05 +0100 |
|---|---|---|
| committer | JosJuice <josjuice@gmail.com> | 2019-03-30 12:45:28 +0100 |
| commit | c885fed9da6f6b0c5862b99904bbb5edbba144fe (patch) | |
| tree | 2e4e5c4165e1602b01509a71a4a60c14e06249a1 /Source/Core/DiscIO/VolumeGC.cpp | |
| parent | c028a84531ce08bb1f24f88ebdcc8885561a89e1 (diff) | |
DiscIO: Make Korean GC checks in Enums.cpp less fragile
Diffstat (limited to 'Source/Core/DiscIO/VolumeGC.cpp')
| -rw-r--r-- | Source/Core/DiscIO/VolumeGC.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/Core/DiscIO/VolumeGC.cpp b/Source/Core/DiscIO/VolumeGC.cpp index 67cf71072e..6d9a48cd0e 100644 --- a/Source/Core/DiscIO/VolumeGC.cpp +++ b/Source/Core/DiscIO/VolumeGC.cpp @@ -97,11 +97,12 @@ Country VolumeGC::GetCountry(const Partition& partition) const // The 0 that we use as a default value is mapped to Country::Unknown and Region::Unknown const u8 country = ReadSwapped<u8>(3, partition).value_or(0); const Region region = GetRegion(); + const std::optional<u16> revision = GetRevision(); - if (CountryCodeToRegion(country, Platform::GameCubeDisc, region) != region) + if (CountryCodeToRegion(country, Platform::GameCubeDisc, region, revision) != region) return TypicalCountryForRegion(region); - return CountryCodeToCountry(country, Platform::GameCubeDisc, region); + return CountryCodeToCountry(country, Platform::GameCubeDisc, region, revision); } std::string VolumeGC::GetMakerID(const Partition& partition) const |