diff options
author | Fred Bauer <fred.w.bauer@gmail.com> | 2011-10-05 04:19:00 +0000 |
---|---|---|
committer | Fred Bauer <fred.w.bauer@gmail.com> | 2011-10-05 04:19:00 +0000 |
commit | b683874e9870658053fedf6ef776b500426c6b86 (patch) | |
tree | 62c1a69069cd306ac6a3232ad36ca9d18bd146f1 /apps/gui | |
parent | 2e58d5935ddb19e0712d7a1c1b59db4665f724f5 (diff) | |
download | rockbox-b683874e9870658053fedf6ef776b500426c6b86.tar.gz rockbox-b683874e9870658053fedf6ef776b500426c6b86.zip |
Do not font_unload() failed fonts when aborting a skin load
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30714 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui')
-rw-r--r-- | apps/gui/skin_engine/skin_parser.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c index adebed2e35..f6b7ff3d3a 100644 --- a/apps/gui/skin_engine/skin_parser.c +++ b/apps/gui/skin_engine/skin_parser.c | |||
@@ -1706,7 +1706,10 @@ static bool skin_load_fonts(struct wps_data *data) | |||
1706 | if (!success || data->font_ids == NULL) | 1706 | if (!success || data->font_ids == NULL) |
1707 | { | 1707 | { |
1708 | while (font_count > 0) | 1708 | while (font_count > 0) |
1709 | font_unload(id_array[--font_count]); | 1709 | { |
1710 | if(id_array[--font_count] != -1) | ||
1711 | font_unload(id_array[font_count]); | ||
1712 | } | ||
1710 | data->font_ids = NULL; | 1713 | data->font_ids = NULL; |
1711 | return false; | 1714 | return false; |
1712 | } | 1715 | } |