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 #7297 from booto/no-dol 

ExportDOL: ActionReplay has a 0'd dol offset. Don't try to extract.
This commit is contained in:
JosJuice 2018-08-03 16:19:18 +02:00 committed by GitHub
parent cf116d488a 800c1570ea
commit d425732837
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -263,7 +263,13 @@ std::optional<u64> GetBootDOLOffset(const Volume& volume, const Partition& parti
if (!IsDisc(volume_type))
return {};
return volume.ReadSwappedAndShifted(0x420, partition);
std::optional<u64> dol_offset = volume.ReadSwappedAndShifted(0x420, partition);
// Datel AR disc has 0x00000000 as the offset (invalid) and doesn't use it in the AppLoader.
if (dol_offset && *dol_offset == 0)
dol_offset.reset();
return dol_offset;
}
std::optional<u32> GetBootDOLSize(const Volume& volume, const Partition& partition, u64 dol_offset)