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 #10995 from JosJuice/nfs-size-out 

DiscIO: Fix calculation of NFS raw size
This commit is contained in:
Mai 2022-08-20 17:57:46 -04:00 committed by GitHub
parent 924a4ee0be aca624ef9c
commit fef8325ff7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/DiscIO/NFSBlob.cpp
View File

@ -76,7 +76,7 @@ std::vector<File::IOFile> NFSFileReader::OpenFiles(const std::string& directory,
std::vector<File::IOFile> files;
files.reserve(file_count);
u64 raw_size = first_file.GetSize();
*raw_size_out = first_file.GetSize();
files.emplace_back(std::move(first_file));
for (u64 i = 1; i < file_count; ++i)
@ -89,16 +89,16 @@ std::vector<File::IOFile> NFSFileReader::OpenFiles(const std::string& directory,
return {};
}
raw_size += child.GetSize();
*raw_size_out += child.GetSize();
files.emplace_back(std::move(child));
}
if (raw_size < expected_raw_size)
if (*raw_size_out < expected_raw_size)
{
ERROR_LOG_FMT(
DISCIO,
"Expected sum of NFS file sizes for {} to be at least {} bytes, but it was {} bytes",
directory, expected_raw_size, raw_size);
directory, expected_raw_size, *raw_size_out);
return {};
}