summaryrefslogtreecommitdiffstats
path: root/apps/talk.c
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2011-08-14 15:51:08 +0000
committerThomas Martitz <kugel@rockbox.org>2011-08-14 15:51:08 +0000
commit89c8cbebf2efd42e26785571a6f58a33d731a110 (patch)
tree63882a3250ce85e18ebb6587b7b441a99045fd38 /apps/talk.c
parentb8fabfef8455166361144428a10e3a5d6bf5466b (diff)
downloadrockbox-89c8cbebf2efd42e26785571a6f58a33d731a110.tar.gz
rockbox-89c8cbebf2efd42e26785571a6f58a33d731a110.tar.bz2
rockbox-89c8cbebf2efd42e26785571a6f58a33d731a110.zip
Add change that got lost somehow in r30308.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30312 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/talk.c')
-rw-r--r--apps/talk.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/apps/talk.c b/apps/talk.c
index f32e1b6e0b..a22aac02b7 100644
--- a/apps/talk.c
+++ b/apps/talk.c
@@ -677,9 +677,7 @@ void talk_init(void)
voicefile_size = filesize(filehandle);
-#if CONFIG_CODEC == SWCODEC
audio_get_buffer(false, NULL); /* Must tell audio to reinitialize */
-#endif
reset_state(); /* use this for most of our inits */
#ifdef TALK_PARTIAL_LOAD
@@ -744,10 +742,10 @@ size_t talkbuf_init(char *bufstart)
{
bool changed = voicebuf != bufstart;
- if (bufstart)
- voicebuf = bufstart;
if (changed) /* must reload voice file */
reset_state();
+ if (bufstart)
+ voicebuf = bufstart;
return voicefile_size;
}