From 6809eef767513084e605cfa29961a12f350702c0 Mon Sep 17 00:00:00 2001 From: Buschel Date: Sun, 13 Feb 2011 21:30:13 +0000 Subject: [PATCH] Do not fiddle with audiobuf in talk_init() when no voice file is present. Avoids stopping of audio playback when changing languages without using voice files. Closes FS#10479. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29300 a1c6a512-1295-4272-9138-f99709370657 --- apps/talk.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/talk.c b/apps/talk.c index ad34437b0..5fddf8598 100644 --- a/apps/talk.c +++ b/apps/talk.c @@ -641,11 +641,6 @@ void talk_init(void) strlcpy((char *)last_lang, (char *)global_settings.lang_file, MAX_FILENAME); -#if CONFIG_CODEC == SWCODEC - audio_get_buffer(false, NULL); /* Must tell audio to reinitialize */ -#endif - reset_state(); /* use this for most of our inits */ - filehandle = open_voicefile(); if (filehandle < 0) { has_voicefile = false; @@ -654,6 +649,11 @@ 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 */ /* test if we can open and if it fits in the audiobuffer */ size_t audiobufsz = audiobufend - audiobuf; -- 2.11.4.GIT