Forks/citra
1
0
Fork 0
mirror of https://github.com/PabloMK7/citra.git synced 2025-10-31 13:50:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

am: Address review comments.

Browse source
This commit is contained in:
Steveice10 2018-07-06 14:16:15 -07:00
parent 680c6e694d
commit d67f119589
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/core/hle/service/am/am.cpp
View file

@ -399,8 +399,12 @@ std::string GetTitleContentPath(Service::FS::MediaType media_type, u64 tid, u16
u32 content_id = 0;
FileSys::TitleMetadata tmd;
if (tmd.Load(tmd_path) == Loader::ResultStatus::Success) {
if(contentIndex && tmd.ContentIndexExists(index)) {
index = tmd.ContentIndexToIndex(index);
if(contentIndex) {
if(tmd.ContentIndexExists(index)) {
index = tmd.ContentIndexToIndex(index);
} else {
LOG_ERROR(Service_AM, "Attempted to get path for non-existent content index {:04x}.", index);
}
}
content_id = tmd.GetContentIDByIndex(index);
@ -530,6 +534,8 @@ void Module::Interface::FindDLCContentInfos(Kernel::HLERequestContext& ctx) {
u64 romfs_offset = 0;
if (!tmd.ContentIndexExists(content_requested[i])) {
LOG_ERROR(Service_AM, "Attempted to get info for non-existent content index {:04x}.", content_requested[i]);
IPC::RequestBuilder rb = rp.MakeBuilder(1, 4);
rb.Push<u32>(-1); // TODO: Find the right error code
rb.PushMappedBuffer(content_requested_in);