diff options
author | Linus Nielsen Feltzing <linus@haxx.se> | 2006-08-01 22:02:47 +0000 |
---|---|---|
committer | Linus Nielsen Feltzing <linus@haxx.se> | 2006-08-01 22:02:47 +0000 |
commit | 30c618cd96f3fb1de03254c891c4c9ca7f8a7355 (patch) | |
tree | 3ff19e2cca984c582de9cd517782d952f2a47a51 /apps/tree.c | |
parent | 73c283e969916b4ff918a7ff9ccb15038fb2ff18 (diff) | |
download | rockbox-30c618cd96f3fb1de03254c891c4c9ca7f8a7355.tar.gz rockbox-30c618cd96f3fb1de03254c891c4c9ca7f8a7355.zip |
Patch #5690 by Steve Bavin - Fix for memory corruption when using .talk clips
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10396 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/tree.c')
-rw-r--r-- | apps/tree.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/apps/tree.c b/apps/tree.c index 83be023475..7543ceb3f7 100644 --- a/apps/tree.c +++ b/apps/tree.c | |||
@@ -1306,8 +1306,10 @@ int ft_play_dirname(char* name) | |||
1306 | int fd; | 1306 | int fd; |
1307 | char dirname_mp3_filename[MAX_PATH+1]; | 1307 | char dirname_mp3_filename[MAX_PATH+1]; |
1308 | 1308 | ||
1309 | #if CONFIG_CODEC != SWCODEC | ||
1309 | if (audio_status() & AUDIO_STATUS_PLAY) | 1310 | if (audio_status() & AUDIO_STATUS_PLAY) |
1310 | return 0; | 1311 | return 0; |
1312 | #endif | ||
1311 | 1313 | ||
1312 | snprintf(dirname_mp3_filename, sizeof(dirname_mp3_filename), "%s/%s/%s", | 1314 | snprintf(dirname_mp3_filename, sizeof(dirname_mp3_filename), "%s/%s/%s", |
1313 | tc.currdir[1] ? tc.currdir : "" , name, | 1315 | tc.currdir[1] ? tc.currdir : "" , name, |
@@ -1334,8 +1336,10 @@ void ft_play_filename(char *dir, char *file) | |||
1334 | { | 1336 | { |
1335 | char name_mp3_filename[MAX_PATH+1]; | 1337 | char name_mp3_filename[MAX_PATH+1]; |
1336 | 1338 | ||
1339 | #if CONFIG_CODEC != SWCODEC | ||
1337 | if (audio_status() & AUDIO_STATUS_PLAY) | 1340 | if (audio_status() & AUDIO_STATUS_PLAY) |
1338 | return; | 1341 | return; |
1342 | #endif | ||
1339 | 1343 | ||
1340 | if (strcasecmp(&file[strlen(file) - strlen(file_thumbnail_ext)], | 1344 | if (strcasecmp(&file[strlen(file) - strlen(file_thumbnail_ext)], |
1341 | file_thumbnail_ext)) | 1345 | file_thumbnail_ext)) |