From 0cb4ce6b628bafc75f2eecfd174b00b6794200d0 Mon Sep 17 00:00:00 2001
From: root <chaos.kagami@gmail.com>
Date: Tue, 24 May 2016 17:39:43 -0400
Subject: [PATCH] Load FIRM as late as possible

---
 source/firm/firm.c | 5 ++++-
 source/main.c      | 6 ------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/source/firm/firm.c b/source/firm/firm.c
index d2f7950..c784db8 100644
--- a/source/firm/firm.c
+++ b/source/firm/firm.c
@@ -398,7 +398,10 @@ load_firms()
 void
 boot_cfw()
 {
-    fprintf(BOTTOM_SCREEN, "Applying patches...\n");
+    fprintf(BOTTOM_SCREEN, "Loading firmware...\n");
+	load_firms();
+
+    fprintf(BOTTOM_SCREEN, "Patching firmware...\n");
     if (patch_firm_all() != 0)
         return;
 
diff --git a/source/main.c b/source/main.c
index c66ec4e..5f7f906 100644
--- a/source/main.c
+++ b/source/main.c
@@ -23,21 +23,15 @@ main()
     if (config.options[OPTION_AUTOBOOT] && !(HID_PAD & BUTTON_R)) {
         if (config.options[OPTION_SILENCE])
             shut_up(); // This does exactly what it sounds like.
-        load_firms();
         doing_autoboot = 1;
         boot_cfw(); // Just boot shit.
     }
 
     int in_menu = 1;
-
-    load_firms();
-
     while (in_menu) {
         in_menu = menu_handler();
     }
 
-    fprintf(BOTTOM_SCREEN, "Booting CFW\n");
-
     save_config(); // Save config file.
 
     boot_cfw();
-- 
2.39.5