Do not initialize the screens in the very common case where the user …

…has only one payload, etc.
LumaTeam · Jan 26, 2021 · 487c2a0 · 487c2a0
1 parent bd2b012
commit 487c2a0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/arm9/source/firm.c b/arm9/source/firm.c
@@ -239,7 +239,8 @@ u32 loadNintendoFirm(FirmwareType *firmType, FirmwareSource nandType, bool loadF
 void loadHomebrewFirm(u32 pressed)
 {
     char path[10 + 255];
-    bool found = !pressed ? payloadMenu(path) : findPayload(path, pressed);
+    bool hasDisplayedMenu = false;
+    bool found = !pressed ? payloadMenu(path, &hasDisplayedMenu) : findPayload(path, pressed);
 
     if(!found) return;
 
@@ -254,10 +255,12 @@ void loadHomebrewFirm(u32 pressed)
     else sprintf(absPath, "nand:/rw/luma/%s", path);
 
     char *argv[2] = {absPath, (char *)fbs};
+    bool wantsScreenInit = (firm->reserved2[0] & 1) != 0;
 
-    initScreens();
+    if(!hasDisplayedMenu && wantsScreenInit)
+        initScreens(); // Don't init the screens unless we have to, if not already done
 
-    launchFirm((firm->reserved2[0] & 1) ? 2 : 1, argv);
+    launchFirm(wantsScreenInit ? 2 : 1, argv);
 }
 
 static inline void mergeSection0(FirmwareType firmType, u32 firmVersion, bool loadFromStorage)

diff --git a/arm9/source/fs.c b/arm9/source/fs.c
@@ -154,10 +154,11 @@ bool findPayload(char *path, u32 pressed)
     return true;
 }
 
-bool payloadMenu(char *path)
+bool payloadMenu(char *path, bool *hasDisplayedMenu)
 {
     DIR dir;
 
+    *hasDisplayedMenu = false;
     if(f_opendir(&dir, "payloads") != FR_OK) return false;
 
     FILINFO info;
@@ -189,6 +190,7 @@ bool payloadMenu(char *path)
     if(payloadNum != 1)
     {
         initScreens();
+        *hasDisplayedMenu = true;
 
         drawString(true, 10, 10, COLOR_TITLE, "Luma3DS chainloader");
         drawString(true, 10, 10 + SPACING_Y, COLOR_TITLE, "Press A to select, START to quit");

diff --git a/arm9/source/fs.h b/arm9/source/fs.h
@@ -36,6 +36,6 @@ u32 getFileSize(const char *path);
 bool fileWrite(const void *buffer, const char *path, u32 size);
 bool fileDelete(const char *path);
 bool findPayload(char *path, u32 pressed);
-bool payloadMenu(char *path);
+bool payloadMenu(char *path, bool *hasDisplayedMenu);
 u32 firmRead(void *dest, u32 firmType);
 void findDumpFile(const char *folderPath, char *fileName);