From 4fd1f9f4c19fe7e9acdd40bef2635ddf6276047f Mon Sep 17 00:00:00 2001
From: RocketRobz <bobesh8@gmail.com>
Date: Fri, 1 Nov 2024 20:19:25 -0600
Subject: [PATCH] Bug fix

---
 title/arm9/source/main.cpp                    | 8 ++++----
 universal/source/nds_loader/nds_loader_arm9.c | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/title/arm9/source/main.cpp b/title/arm9/source/main.cpp
index f86a7ebd59..e5c97fe8e7 100644
--- a/title/arm9/source/main.cpp
+++ b/title/arm9/source/main.cpp
@@ -1828,10 +1828,6 @@ int titleMode(void)
 		*(u32*)0x02FF8000 = 0x53535A4C;
 	}
 
-	#ifndef _NO_BOOTSTUB_
-	installBootStub(sdFound());
-	#endif
-
 	if (isDSiMode() && sdFound()) {
 		if ((access("sd:/_nds/bios9i.bin", F_OK) != 0) && (access("sd:/_nds/bios9i_part1.bin", F_OK) != 0)) {
 			extern char copyBuf[0x8000];
@@ -2116,6 +2112,10 @@ int titleMode(void)
 		}
 	}
 
+	#ifndef _NO_BOOTSTUB_
+	installBootStub(sdFound());
+	#endif
+
 	ms().loadSettings();
 	bs().loadSettings();
 	logInit();
diff --git a/universal/source/nds_loader/nds_loader_arm9.c b/universal/source/nds_loader/nds_loader_arm9.c
index dab7d8bb73..3294d02456 100644
--- a/universal/source/nds_loader/nds_loader_arm9.c
+++ b/universal/source/nds_loader/nds_loader_arm9.c
@@ -557,7 +557,8 @@ void installBootStub(bool havedsiSD) {
 	if (havedsiSD) {
 		bootloader[3] = 0; // don't dldi patch
 		bootloader[7] = 1; // use internal dsi SD code
-	} else {
+	}
+	if (memcmp(io_dldi_data->friendlyName, "Default", 7) != 0) {
 		dldiPatchLoader ();
 	}
 	bootstub->arm9reboot = (VoidFn)(((u32)bootstub->arm9reboot)+fake_heap_end);