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 #8303 from JosJuice/volumeverifier-very-small 

Fix problems with running VolumeVerifier on very small disc images
This commit is contained in:
Connor McLaughlin 2019-08-09 22:16:33 +10:00 committed by GitHub
parent 2df522d4eb 107291dc5a
commit e87a3f91a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/DiscIO/DiscScrubber.cpp
View File

@ -44,7 +44,8 @@ bool DiscScrubber::SetupScrub(const Volume* disc, int block_size)
m_file_size = m_disc->GetSize(); m_file_size = m_disc->GetSize();
const size_t num_clusters = static_cast<size_t>(m_file_size / CLUSTER_SIZE); // Round up when diving by CLUSTER_SIZE, otherwise MarkAsUsed might write out of bounds
const size_t num_clusters = static_cast<size_t>((m_file_size + CLUSTER_SIZE - 1) / CLUSTER_SIZE);
// Warn if not DVD5 or DVD9 size // Warn if not DVD5 or DVD9 size
if (num_clusters != 0x23048 && num_clusters != 0x46090) if (num_clusters != 0x23048 && num_clusters != 0x46090)

2
Source/Core/DolphinQt/Config/VerifyWidget.cpp
View File

@ -117,7 +117,7 @@ void VerifyWidget::Verify()
verifier.Finish(); verifier.Finish();
DiscIO::VolumeVerifier::Result result = verifier.GetResult(); DiscIO::VolumeVerifier::Result result = verifier.GetResult();
progress->setValue(verifier.GetBytesProcessed() / DIVISOR); progress->reset();
m_summary_text->setText(QString::fromStdString(result.summary_text)); m_summary_text->setText(QString::fromStdString(result.summary_text));