From a89837ac61c75e335cbb1d722872bb8ae9cbc9b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nils=20Wallm=C3=A9nius?= Date: Sun, 14 Dec 2008 10:16:07 +0000 Subject: [PATCH] Accept patch in FS#9637 by Keith Perri, fixing a crash when loading a cfg which specified a non existant font. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19434 a1c6a512-1295-4272-9138-f99709370657 --- apps/settings.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/settings.c b/apps/settings.c index 4babe33cdb..47849cb1ce 100644 --- a/apps/settings.c +++ b/apps/settings.c @@ -820,7 +820,8 @@ void settings_apply(bool read_disk) if ( global_settings.font_file[0]) { snprintf(buf, sizeof buf, FONT_DIR "/%s.fnt", global_settings.font_file); - font_load(buf); + if (font_load(buf) == NULL) + font_reset(); } else font_reset();