diff -u -r cvs-greg/apps/main.c build/apps/main.c
--- cvs-greg/apps/main.c	Fri Sep 13 20:04:45 2002
+++ build/apps/main.c	Thu Sep 19 01:46:55 2002
@@ -64,7 +64,7 @@
 {
     init_threads();
     lcd_init();
-    font_init();
+    font_init(0);
     show_logo();
     settings_reset();
     settings_load();
@@ -93,6 +93,7 @@
     // because may use loadable font in show_logo().
     // I didn't call font_init here, since
     // disk system isn't up yet.
+    font_init(0);
     show_logo();
 
 #ifdef DEBUG
@@ -160,7 +161,7 @@
     status_init();
     usb_start_monitoring();
     power_init();
-    font_init();
+    font_init(1);
 }
 
 int main(void)
diff -u -r cvs-greg/firmware/font.c build/firmware/font.c
--- cvs-greg/firmware/font.c	Thu Sep 19 02:00:42 2002
+++ build/firmware/font.c	Thu Sep 19 01:46:05 2002
@@ -70,13 +70,13 @@
                 unsigned int height);
 
 void
-font_init(void)
+font_init(int load_fonts)
 {
     struct corefont *cfp;
     PMWCFONT pf;
 
     for (cfp=sysfonts; cfp < &sysfonts[MAXFONTS]; ++cfp) {
-        if (cfp->pf && cfp->diskname) {
+        if (cfp->pf && cfp->diskname && load_fonts) {
             pf = font_load(cfp->diskname, cfp->pf);
 #if defined(DEBUG) || defined(SIMULATOR)
             if (!pf)
@@ -85,7 +85,7 @@
         }
 
         /* one-time rotate font bits to rockbox format*/
-        if (cfp->pf && !cfp->diskname)
+        if (cfp->pf && !cfp->diskname && !load_fonts)
             rotate_font_bits(cfp->pf);
     }
 }
diff -u -r cvs-greg/firmware/font.h build/firmware/font.h
--- cvs-greg/firmware/font.h	Thu Sep 19 02:00:42 2002
+++ build/firmware/font.h	Thu Sep 19 01:47:17 2002
@@ -100,7 +100,7 @@
 extern int curfont;
 
 /* font routines*/
-void font_init(void);
+void font_init(int load_fonts);
 PMWCFONT font_load(char *path, PMWCFONT pf);
 void font_free(int font);
 PMWCFONT getfont(int font);
@@ -110,7 +110,7 @@
 
 #else /* HAVE_LCD_BITMAP */
 
-#define font_init()
+#define font_init(x)
 
 #endif