Revert r24958. It didn't fix anything (in fact, the problem described didn't exist). Increase MAXFONTS by 1 to allow for remote screen targets to load fonts 2-9.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24983 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 3 insertions, 2 deletions

diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c
index 31228789be..13e2df5889 100644
--- a/apps/gui/skin_engine/skin_parser.c
+++ b/apps/gui/skin_engine/skin_parser.c
@@ -935,10 +935,10 @@ static int parse_viewport(const char *wps_bufptr,
     else
         vp->flags &= ~VP_FLAG_ALIGN_RIGHT; /* ignore right-to-left languages */
 
-#ifdef HAVE_REMOTE_LCD
     /* increment because font==2 and FONT_UI_REMOTE is ambiguous */
     if (vp->font > FONT_UI)
         vp->font++;
+#ifdef HAVE_REMOTE_LCD
     if (vp->font == FONT_UI && curr_screen == SCREEN_REMOTE)
         vp->font = FONT_UI_REMOTE;
 #endif
diff --git a/firmware/export/font.h b/firmware/export/font.h
index fb6438ea66..307db6967d 100644
--- a/firmware/export/font.h
+++ b/firmware/export/font.h
@@ -55,7 +55,8 @@ enum {
     FONT_FIRSTUSERFONT = 2
 };
 
-#define MAXFONTS 10
+/* SYSFONT, FONT_UI, FONT_UI_REMOTE + 8 fonts in skins */
+#define MAXFONTS 11
 
 /*
  * .fnt loadable font file format definition