summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorLinus Nielsen Feltzing <linus@haxx.se>2004-03-22 12:34:06 +0000
committerLinus Nielsen Feltzing <linus@haxx.se>2004-03-22 12:34:06 +0000
commit9e11ff81d56fed38a840c2b055677b377a26ff8c (patch)
tree6413f735a38e7e44fba8294c499fbe57106b84cd /apps
parentf1f7bbe98a5929a400280b72d078a9ef920c592f (diff)
downloadrockbox-9e11ff81d56fed38a840c2b055677b377a26ff8c.tar.gz
rockbox-9e11ff81d56fed38a840c2b055677b377a26ff8c.tar.bz2
rockbox-9e11ff81d56fed38a840c2b055677b377a26ff8c.zip
talk_value() and talk_number() didn't check if the music was playing
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4431 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/talk.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/apps/talk.c b/apps/talk.c
index a54325192e..906563e23a 100644
--- a/apps/talk.c
+++ b/apps/talk.c
@@ -352,6 +352,9 @@ int talk_number(int n, bool enqueue)
int level = 0; /* mille count */
int mil = 1000000000; /* highest possible "-illion" */
+ if (mpeg_status()) /* busy, buffer in use */
+ return -1;
+
if (!enqueue)
shutup(); /* cut off all the pending stuff */
@@ -427,6 +430,9 @@ int talk_value(int n, int unit, bool enqueue)
VOICE_HERTZ,
};
+ if (mpeg_status()) /* busy, buffer in use */
+ return -1;
+
if (unit < 0 || unit >= UNIT_LAST)
unit_id = -1;
else