Patch #5766 by Steve Bavin - Fix for various voice related crashes

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10590 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 5 insertions, 3 deletions

diff --git a/apps/settings_menu.c b/apps/settings_menu.c
index 48e8c1dda5..448411593a 100644
--- a/apps/settings_menu.c
+++ b/apps/settings_menu.c
@@ -1264,16 +1264,20 @@ static const struct opt_items voice_names[] = {
 
 static bool voice_dirs(void)
 {
-    return set_option( str(LANG_VOICE_DIR),
+    bool ret = set_option( str(LANG_VOICE_DIR),
                        &global_settings.talk_dir, INT, voice_names, 4, NULL);
+    audio_set_crossfade(global_settings.crossfade);
+    return ret;
 }
 
 static bool voice_files(void)
 {
     int oldval = global_settings.talk_file;
     bool ret;
+
     ret = set_option( str(LANG_VOICE_FILE),
                        &global_settings.talk_file, INT, voice_names, 4, NULL);
+    audio_set_crossfade(global_settings.crossfade);
     if (oldval != 3 && global_settings.talk_file == 3)
     {   /* force reload if newly talking thumbnails,
            because the clip presence is cached only if enabled */
@@ -1462,9 +1466,7 @@ static bool crossfade(void)
 
     ret=set_option( str(LANG_CROSSFADE_ENABLE),
                     &global_settings.crossfade, INT, names, 4, NULL);
-
     audio_set_crossfade(global_settings.crossfade);
-
     return ret;
 }