diff --git a/stratosphere/loader/source/ldr_content_management.cpp b/stratosphere/loader/source/ldr_content_management.cpp index 2d5850016..efb2129e1 100644 --- a/stratosphere/loader/source/ldr_content_management.cpp +++ b/stratosphere/loader/source/ldr_content_management.cpp @@ -56,7 +56,7 @@ Result ContentManagement::MountCode(u64 tid, FsStorageId sid) { RefreshConfigurationData(); } - if (ShouldOverrideContents() && R_SUCCEEDED(MountCodeNspOnSd(tid))) { + if (ShouldOverrideContents(tid) && R_SUCCEEDED(MountCodeNspOnSd(tid))) { return 0x0; } @@ -302,7 +302,7 @@ bool ContentManagement::ShouldReplaceWithHBL(u64 tid) { return g_mounted_hbl_nsp && tid == g_override_hbl_tid; } -bool ContentManagement::ShouldOverrideContents() { +bool ContentManagement::ShouldOverrideContents(u64 tid) { if (HasCreatedTitle(0x0100000000001000)) { u64 kDown = 0; bool keys_triggered = (R_SUCCEEDED(HidManagement::GetKeysDown(&kDown)) && ((kDown & g_override_key_combination) != 0)); @@ -311,4 +311,4 @@ bool ContentManagement::ShouldOverrideContents() { /* Always redirect before qlaunch. */ return g_has_initialized_fs_dev; } -} \ No newline at end of file +} diff --git a/stratosphere/loader/source/ldr_content_management.hpp b/stratosphere/loader/source/ldr_content_management.hpp index 183415f8f..9de9c2b29 100644 --- a/stratosphere/loader/source/ldr_content_management.hpp +++ b/stratosphere/loader/source/ldr_content_management.hpp @@ -38,5 +38,5 @@ class ContentManagement { static void TryMountSdCard(); static bool ShouldReplaceWithHBL(u64 tid); - static bool ShouldOverrideContents(); + static bool ShouldOverrideContents(u64 tid); }; diff --git a/stratosphere/loader/source/ldr_npdm.cpp b/stratosphere/loader/source/ldr_npdm.cpp index 8d7eb0f37..e7a110ced 100644 --- a/stratosphere/loader/source/ldr_npdm.cpp +++ b/stratosphere/loader/source/ldr_npdm.cpp @@ -53,7 +53,7 @@ FILE *NpdmUtils::OpenNpdmFromSdCard(u64 title_id) { FILE *NpdmUtils::OpenNpdm(u64 title_id) { - if (ContentManagement::ShouldOverrideContents()) { + if (ContentManagement::ShouldOverrideContents(title_id)) { if (ContentManagement::ShouldReplaceWithHBL(title_id)) { return OpenNpdmFromHBL(); } @@ -182,7 +182,7 @@ Result NpdmUtils::LoadNpdm(u64 tid, NpdmInfo *out) { info->acid->title_id_range_max = tid; info->aci0->title_id = tid; - if (ContentManagement::ShouldOverrideContents() && ContentManagement::ShouldReplaceWithHBL(tid) + if (ContentManagement::ShouldOverrideContents(tid) && ContentManagement::ShouldReplaceWithHBL(tid) && R_SUCCEEDED(LoadNpdmInternal(OpenNpdmFromExeFS(), &g_original_npdm_cache))) { NpdmInfo *original_info = &g_original_npdm_cache.info; /* Fix pool partition. */ diff --git a/stratosphere/loader/source/ldr_nso.cpp b/stratosphere/loader/source/ldr_nso.cpp index 451093e7c..a90a03f94 100644 --- a/stratosphere/loader/source/ldr_nso.cpp +++ b/stratosphere/loader/source/ldr_nso.cpp @@ -61,7 +61,7 @@ bool NsoUtils::CheckNsoStubbed(unsigned int index, u64 title_id) { } FILE *NsoUtils::OpenNso(unsigned int index, u64 title_id) { - if (ContentManagement::ShouldOverrideContents()) { + if (ContentManagement::ShouldOverrideContents(title_id)) { if (ContentManagement::ShouldReplaceWithHBL(title_id)) { return OpenNsoFromHBL(index); }