summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFred Bauer <fred.w.bauer@gmail.com>2011-09-27 21:06:12 +0000
committerFred Bauer <fred.w.bauer@gmail.com>2011-09-27 21:06:12 +0000
commita1d3a1d14364425489db2b49d8e4a40f1b995b90 (patch)
treef194829de5374044fddbd0699a1f204aeb4ebe35
parent5adf7d315d80644dc86743beeaba2c45c188fd9f (diff)
downloadrockbox-a1d3a1d14364425489db2b49d8e4a40f1b995b90.tar.gz
rockbox-a1d3a1d14364425489db2b49d8e4a40f1b995b90.zip
Delay settings_reset() until after font_init(). Fixes boot crash on Fuze(v1) and probably others.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30613 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/main.c b/apps/main.c
index 84f8bc3893..4d1293dcce 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -446,8 +446,6 @@ static void init(void)
446 * before any other moveable allocs. */ 446 * before any other moveable allocs. */
447 theme_init_buffer(); 447 theme_init_buffer();
448 448
449 settings_reset();
450
451 i2c_init(); 449 i2c_init();
452 450
453 power_init(); 451 power_init();
@@ -468,6 +466,8 @@ static void init(void)
468 global_status.font_id[rc] = FONT_SYSFIXED; 466 global_status.font_id[rc] = FONT_SYSFIXED;
469 font_init(); 467 font_init();
470#endif 468#endif
469
470 settings_reset();
471 471
472 CHART(">show_logo"); 472 CHART(">show_logo");
473 show_logo(); 473 show_logo();