Load FIRM as late as possible

diff --git a/source/firm/firm.c b/source/firm/firm.c
index d2f79508be276c3fd9953c1075ad5ef90832fe91..c784db80b1bca232e6e67067c8c4d9b56938c91b 100644 (file)
--- 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 c66ec4e5bfd8086c3e3aedbca775118af82d710d..5f7f906108b5b68e54f747937e67e58156f4e12a 100644 (file)
--- 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();