From 353e27b9e24054573514e3cee59b1c4a4afd9484 Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Tue, 14 Apr 2020 03:20:23 -0700 Subject: [PATCH] ldr: update 10.0.0 conditionals --- stratosphere/loader/source/ldr_loader_service.cpp | 1 + stratosphere/loader/source/ldr_meta.cpp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/stratosphere/loader/source/ldr_loader_service.cpp b/stratosphere/loader/source/ldr_loader_service.cpp index a98f21705..65954ac78 100644 --- a/stratosphere/loader/source/ldr_loader_service.cpp +++ b/stratosphere/loader/source/ldr_loader_service.cpp @@ -98,6 +98,7 @@ namespace ams::ldr { Result LoaderService::SetEnabledProgramVerification(bool enabled) { ldr::SetEnabledProgramVerification(enabled); + return ResultSuccess(); } /* Atmosphere commands. */ diff --git a/stratosphere/loader/source/ldr_meta.cpp b/stratosphere/loader/source/ldr_meta.cpp index 94ba0958b..0da9a3338 100644 --- a/stratosphere/loader/source/ldr_meta.cpp +++ b/stratosphere/loader/source/ldr_meta.cpp @@ -219,7 +219,8 @@ namespace ams::ldr { } } else if (hos::GetVersion() >= hos::Version_10_0_0) { /* If storage id is none, there is no base code filesystem, and thus it is impossible for us to validate. */ - if (static_cast(loc.storage_id) != ncm::StorageId::None) { + /* However, if we're an application, we are guaranteed a base code filesystem. */ + if (static_cast(loc.storage_id) != ncm::StorageId::None || ncm::IsApplicationId(loc.program_id)) { R_TRY(fs::OpenFile(std::addressof(file), BaseMetaPath, fs::OpenMode_Read)); ON_SCOPE_EXIT { fs::CloseFile(file); }; R_TRY(LoadMetaFromFile(file, &g_original_meta_cache));