devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Previous fix broke voice init when no language file had been selected. Fix that by making sure voice init is run at least once.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8848 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Magnus Holmgren 2006-02-26 16:07:34 +00:00
parent 2f76763d73
commit 7ac7317038
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apps/talk.c
View file

@ -95,6 +95,7 @@ static long silence_len; /* length of the VOICE_PAUSE clip */
static unsigned char* p_lastclip; /* address of latest clip, for silence add */
static unsigned long voicefile_size = 0; /* size of the loaded voice file */
static unsigned char last_lang[MAX_FILENAME+1]; /* name of last used lang file (in talk_init) */
static bool talk_initialized; /* true if talk_init has been called */
/***************** Private prototypes *****************/
@ -473,12 +474,13 @@ static void reset_state(void)
void talk_init(void)
{
if (!strcasecmp(last_lang, global_settings.lang_file))
if (talk_initialized && !strcasecmp(last_lang, global_settings.lang_file))
{
/* not a new file, nothing to do */
return;
}
talk_initialized = true;
strncpy((char *) last_lang, (char *)global_settings.lang_file,
MAX_FILENAME);