piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

VolumeVerifier: Don't show an assert for files that are too small

Browse Source
This commit is contained in:
JosJuice
2020-01-22 19:06:09 +01:00
parent f8f9dbdec3
commit e449d23929
1 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1238,9 +1238,6 @@ void VolumeVerifier::Finish()
WaitForAsyncOperations(); WaitForAsyncOperations();
ASSERT(m_content_index == m_content_offsets.size());
ASSERT(m_block_index == m_blocks.size());
if (m_calculating_any_hash) if (m_calculating_any_hash)
{ {
if (m_hashes_to_calculate.crc32) if (m_hashes_to_calculate.crc32)
@ -1267,11 +1264,20 @@ void VolumeVerifier::Finish()
if (m_read_errors_occurred) if (m_read_errors_occurred)
AddProblem(Severity::Medium, Common::GetStringT("Some of the data could not be read.")); AddProblem(Severity::Medium, Common::GetStringT("Some of the data could not be read."));
bool file_too_small = false;
if (m_content_index != m_content_offsets.size() || m_block_index != m_blocks.size())
file_too_small = true;
if (IsDisc(m_volume.GetVolumeType()) && if (IsDisc(m_volume.GetVolumeType()) &&
(m_volume.IsSizeAccurate() || m_volume.SupportsIntegrityCheck())) (m_volume.IsSizeAccurate() || m_volume.SupportsIntegrityCheck()))
{ {
u64 volume_size = m_volume.IsSizeAccurate() ? m_volume.GetSize() : m_biggest_verified_offset; u64 volume_size = m_volume.IsSizeAccurate() ? m_volume.GetSize() : m_biggest_verified_offset;
if (m_biggest_referenced_offset > volume_size) if (m_biggest_referenced_offset > volume_size)
file_too_small = true;
}
if (file_too_small)
{ {
const bool second_layer_missing = const bool second_layer_missing =
m_biggest_referenced_offset > SL_DVD_SIZE && m_volume.GetSize() >= SL_DVD_SIZE; m_biggest_referenced_offset > SL_DVD_SIZE && m_volume.GetSize() >= SL_DVD_SIZE;
@ -1286,7 +1292,6 @@ void VolumeVerifier::Finish()
AddProblem(Severity::High, std::move(text)); AddProblem(Severity::High, std::move(text));
return; return;
} }
}
for (auto [partition, blocks] : m_block_errors) for (auto [partition, blocks] : m_block_errors)
{ {