lux/citra
1
0
Fork 0
mirror of https://git.h3cjp.net/H3cJP/citra.git synced 2024-12-01 00:12:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8799 from liamwhite/where-did-the-padding-go

Browse source 
core/file_sys: fix alignment of BuildId
This commit is contained in:
liamwhite 2022-08-21 14:06:06 -04:00 committed by GitHub
parent b99596e312 518317b717
commit 7fab7b829c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/file_sys/ips_layer.cpp
View file

@ -217,7 +217,7 @@ void IPSwitchCompiler::Parse() {
break; break;
} else if (StartsWith(line, "@nsobid-")) { } else if (StartsWith(line, "@nsobid-")) {
// NSO Build ID Specifier // NSO Build ID Specifier
const auto raw_build_id = fmt::format("{:0>64}", line.substr(8)); const auto raw_build_id = fmt::format("{:0<64}", line.substr(8));
nso_build_id = Common::HexStringToArray<0x20>(raw_build_id); nso_build_id = Common::HexStringToArray<0x20>(raw_build_id);
} else if (StartsWith(line, "#")) { } else if (StartsWith(line, "#")) {
// Mandatory Comment // Mandatory Comment

4
src/core/file_sys/patch_manager.cpp
View file

@ -191,7 +191,7 @@ VirtualDir PatchManager::PatchExeFS(VirtualDir exefs) const {
std::vector<VirtualFile> PatchManager::CollectPatches(const std::vector<VirtualDir>& patch_dirs, std::vector<VirtualFile> PatchManager::CollectPatches(const std::vector<VirtualDir>& patch_dirs,
const std::string& build_id) const { const std::string& build_id) const {
const auto& disabled = Settings::values.disabled_addons[title_id]; const auto& disabled = Settings::values.disabled_addons[title_id];
const auto nso_build_id = fmt::format("{:0>64}", build_id); const auto nso_build_id = fmt::format("{:0<64}", build_id);
std::vector<VirtualFile> out; std::vector<VirtualFile> out;
out.reserve(patch_dirs.size()); out.reserve(patch_dirs.size());
@ -206,7 +206,7 @@ std::vector<VirtualFile> PatchManager::CollectPatches(const std::vector<VirtualD
auto name = file->GetName(); auto name = file->GetName();
const auto this_build_id = const auto this_build_id =
fmt::format("{:0>64}", name.substr(0, name.find('.'))); fmt::format("{:0<64}", name.substr(0, name.find('.')));
if (nso_build_id == this_build_id) if (nso_build_id == this_build_id)
out.push_back(file); out.push_back(file);
} else if (file->GetExtension() == "pchtxt") { } else if (file->GetExtension() == "pchtxt") {