diff options
author | Björn Stenberg <bjorn@haxx.se> | 2002-10-09 23:13:25 +0000 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2002-10-09 23:13:25 +0000 |
commit | 227253cfe4ab16c9758473194271ed48bf2e28b1 (patch) | |
tree | 8ebd8cbaa4cc11e08888277148633c480f9329ab /firmware/font.c | |
parent | d4b884e7e0568d33e4f1bfad51886f6a87373d53 (diff) | |
download | rockbox-227253cfe4ab16c9758473194271ed48bf2e28b1.tar.gz rockbox-227253cfe4ab16c9758473194271ed48bf2e28b1.zip |
'Reset settings' now also resets wps, font and language (although you have to reboot to get back to the old language).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2552 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/font.c')
-rw-r--r-- | firmware/font.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/firmware/font.c b/firmware/font.c index 6f5156cc73..2fe43b5fd3 100644 --- a/firmware/font.c +++ b/firmware/font.c | |||
@@ -114,6 +114,11 @@ static int readstrpad(char *buf, int totlen) | |||
114 | return totlen; | 114 | return totlen; |
115 | } | 115 | } |
116 | 116 | ||
117 | void font_reset(void) | ||
118 | { | ||
119 | memset(&font_ui, 0, sizeof(struct font)); | ||
120 | } | ||
121 | |||
117 | /* read and load font into incore font structure*/ | 122 | /* read and load font into incore font structure*/ |
118 | struct font* font_load(char *path) | 123 | struct font* font_load(char *path) |
119 | { | 124 | { |
@@ -132,7 +137,7 @@ struct font* font_load(char *path) | |||
132 | return NULL; | 137 | return NULL; |
133 | } | 138 | } |
134 | 139 | ||
135 | memset(pf, 0, sizeof(struct font)); | 140 | font_reset(); |
136 | 141 | ||
137 | /* currently, font loading replaces earlier font allocation*/ | 142 | /* currently, font loading replaces earlier font allocation*/ |
138 | freeptr = (unsigned char *)(((int)mbuf + 3) & ~3); | 143 | freeptr = (unsigned char *)(((int)mbuf + 3) & ~3); |