From fdc1eaa16c24d692d8b20f74938d2644d52e4a43 Mon Sep 17 00:00:00 2001
From: TuxSH <1922548+TuxSH@users.noreply.github.com>
Date: Sat, 2 May 2020 18:08:24 +0100
Subject: [PATCH] pm: quick safe_firm fixes

---
 sysmodules/pm/source/launch.c | 2 +-
 sysmodules/pm/source/luma.c   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sysmodules/pm/source/launch.c b/sysmodules/pm/source/launch.c
index 56c1c57..df8c250 100644
--- a/sysmodules/pm/source/launch.c
+++ b/sysmodules/pm/source/launch.c
@@ -208,7 +208,7 @@ static Result launchTitleImpl(Handle *debug, ProcessData **outProcessData, const
     TRY(registerProgram(&programHandle, programInfo, programInfoUpdate));
 
     res = LOADER_GetProgramInfo(exheaderInfo, programHandle);
-    res = R_SUCCEEDED(res) && exheaderInfo->aci.local_caps.core_info.core_version != SYSCOREVER ? (Result)0xC8A05800 : res;
+    res = R_SUCCEEDED(res) && SYSCOREVER == 2 && exheaderInfo->aci.local_caps.core_info.core_version != SYSCOREVER ? (Result)0xC8A05800 : res;
 
     if (R_FAILED(res)) {
         LOADER_UnregisterProgram(programHandle);
diff --git a/sysmodules/pm/source/luma.c b/sysmodules/pm/source/luma.c
index 45d1735..cd3f489 100644
--- a/sysmodules/pm/source/luma.c
+++ b/sysmodules/pm/source/luma.c
@@ -15,5 +15,5 @@ bool isTitleLaunchPrevented(u64 titleId)
     s64 numKips = 0;
 
     svcGetSystemInfo(&numKips, 26, 0);
-    return numKips >= 6 && (titleId & ~N3DS_TID_BIT) == 0x0004003000008A02ULL; // ErrDisp
-}
\ No newline at end of file
+    return numKips >= 6 && (titleId & ~(N3DS_TID_MASK | 1)) == 0x0004003000008A02ULL; // ErrDisp
+}