summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Bavin <pondlife@pondlife.me>2008-07-29 13:32:47 +0000
committerSteve Bavin <pondlife@pondlife.me>2008-07-29 13:32:47 +0000
commitfa98298983c9d6b5e165ef077359f5786b43566f (patch)
treeab66807dd1cba0c5b5420c66c7e2106604dc8f3e
parent34dc7c445adcf41d0bf1820c361ca8017e9cfddd (diff)
Only voice track insertion splash if voice menus enabled - fix for FS#9223
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18147 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/playlist.c2
-rw-r--r--apps/playlist_catalog.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/playlist.c b/apps/playlist.c
index 53becb9fc1..f6d536fa25 100644
--- a/apps/playlist.c
+++ b/apps/playlist.c
@@ -2916,7 +2916,7 @@ int playlist_insert_directory(struct playlist_info* playlist,
if (queue)
count_str = ID2P(LANG_PLAYLIST_QUEUE_COUNT);
else
- count_str = ID2P(LANG_PLAYLIST_INSERT_COUNT);
+ count_str = ID2P(LANG_PLAYLIST_INSERT_COUNT);
display_playlist_count(0, count_str, false);
diff --git a/apps/playlist_catalog.c b/apps/playlist_catalog.c
index 15d74fa363..cadad9f464 100644
--- a/apps/playlist_catalog.c
+++ b/apps/playlist_catalog.c
@@ -319,8 +319,8 @@ static int display_playlists(char* playlist, bool view)
static void display_insert_count(int count)
{
static long talked_tick = 0;
- if(count && (talked_tick == 0
- || TIME_AFTER(current_tick, talked_tick+5*HZ)))
+ if(global_settings.talk_menu && count &&
+ (talked_tick == 0 || TIME_AFTER(current_tick, talked_tick+5*HZ)))
{
talked_tick = current_tick;
talk_number(count, false);