diff options
| author | Jonathan Gordon <rockbox@jdgordon.info> | 2010-03-03 05:43:02 +0000 |
|---|---|---|
| committer | Jonathan Gordon <rockbox@jdgordon.info> | 2010-03-03 05:43:02 +0000 |
| commit | 25d9771ebc569fa0e66d7376efebd32230f817c3 (patch) | |
| tree | 7575a42b458603e7b5008fae74f47f160d08f6ef /apps | |
| parent | fad70c1086ec1c2934a8f1f0b9388d169d3dde72 (diff) | |
| download | rockbox-25d9771ebc569fa0e66d7376efebd32230f817c3.zip rockbox-25d9771ebc569fa0e66d7376efebd32230f817c3.tar.gz rockbox-25d9771ebc569fa0e66d7376efebd32230f817c3.tar.bz2 rockbox-25d9771ebc569fa0e66d7376efebd32230f817c3.tar.xz | |
make %Fl (font load) more consistant with bmp loading and require the whole filename, i.e require the .fnt.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25001 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/gui/skin_engine/skin_parser.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c index d3d4911..577e1aa 100644 --- a/apps/gui/skin_engine/skin_parser.c +++ b/apps/gui/skin_engine/skin_parser.c @@ -726,6 +726,11 @@ static int parse_font_load(const char *wps_bufptr, DEBUGF("font id %d already being used\n", id); } #endif + /* make sure the filename contains .fnt, + * we dont actually use it, but require it anyway */ + ptr = strchr(filename, '.'); + if (!ptr || strncmp(ptr, ".fnt|", 5)) + return WPS_ERROR_INVALID_PARAM; skinfonts[id-FONT_FIRSTUSERFONT].id = -1; skinfonts[id-FONT_FIRSTUSERFONT].name = filename; @@ -2113,8 +2118,8 @@ static bool skin_load_fonts(struct wps_data *data) * multiple viewports use the same */ if (font->id < 0) { - char *bar = strchr(font->name, '|'); - *bar = '\0'; + char *dot = strchr(font->name, '.'); + *dot = '\0'; font->id = skin_font_load(font->name); } |