ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8764 from JosJuice/volumeverifier-dual-layer-desync 

VolumeVerifier: Show desync warning for dual layer discs too
This commit is contained in:
Léo Lam 2020-04-27 12:04:45 +02:00 committed by GitHub
parent 0a71dda8a0 bacf0d629d
commit f2f8168966
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Source/Core/DiscIO/VolumeVerifier.cpp
View File

@ -735,7 +735,8 @@ void VolumeVerifier::CheckDiscSize(const std::vector<Partition>& partitions)
return; return;
m_biggest_referenced_offset = GetBiggestReferencedOffset(partitions); m_biggest_referenced_offset = GetBiggestReferencedOffset(partitions);
if (ShouldBeDualLayer() && m_biggest_referenced_offset <= SL_DVD_R_SIZE) const bool should_be_dual_layer = ShouldBeDualLayer();
if (should_be_dual_layer && m_biggest_referenced_offset <= SL_DVD_R_SIZE)
{ {
AddProblem(Severity::Medium, AddProblem(Severity::Medium,
Common::GetStringT( Common::GetStringT(
@ -753,7 +754,7 @@ void VolumeVerifier::CheckDiscSize(const std::vector<Partition>& partitions)
else if (!m_is_tgc) else if (!m_is_tgc)
{ {
const Platform platform = m_volume.GetVolumeType(); const Platform platform = m_volume.GetVolumeType();
const bool is_gc_size = platform == Platform::GameCubeDisc || m_is_datel; const bool should_be_gc_size = platform == Platform::GameCubeDisc || m_is_datel;
const u64 size = m_volume.GetSize(); const u64 size = m_volume.GetSize();
const bool valid_gamecube = size == MINI_DVD_SIZE; const bool valid_gamecube = size == MINI_DVD_SIZE;
@ -761,8 +762,8 @@ void VolumeVerifier::CheckDiscSize(const std::vector<Partition>& partitions)
const bool valid_debug_wii = size == SL_DVD_R_SIZE || size == DL_DVD_R_SIZE; const bool valid_debug_wii = size == SL_DVD_R_SIZE || size == DL_DVD_R_SIZE;
const bool debug = IsDebugSigned(); const bool debug = IsDebugSigned();
if ((is_gc_size && !valid_gamecube) || if ((should_be_gc_size && !valid_gamecube) ||
(!is_gc_size && (debug ? !valid_debug_wii : !valid_retail_wii))) (!should_be_gc_size && (debug ? !valid_debug_wii : !valid_retail_wii)))
{ {
if (debug && valid_retail_wii) if (debug && valid_retail_wii)
{ {
@ -772,7 +773,15 @@ void VolumeVerifier::CheckDiscSize(const std::vector<Partition>& partitions)
} }
else else
{ {
if ((is_gc_size && size < MINI_DVD_SIZE) || (!is_gc_size && size < SL_DVD_SIZE)) u64 normal_size;
if (should_be_gc_size)
normal_size = MINI_DVD_SIZE;
else if (!should_be_dual_layer)
normal_size = SL_DVD_SIZE;
else
normal_size = DL_DVD_SIZE;
if (size < normal_size)
{ {
AddProblem( AddProblem(
Severity::Low, Severity::Low,