diff options
| author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-06-22 15:03:32 +0000 |
|---|---|---|
| committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-06-22 15:03:32 +0000 |
| commit | 87786050a261b73a6c23270d71deb0a2f471b990 (patch) | |
| tree | f5736c1a8c247febcff9b3ad7ba3214c2f3a146f /main/file.c | |
| parent | 59b29501f4d9f3ddeab31739edd8d110fbba49c6 (diff) | |
Merged revisions 71068 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r71068 | qwell | 2007-06-22 10:00:30 -0500 (Fri, 22 Jun 2007) | 12 lines
Merged revisions 71065 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r71065 | qwell | 2007-06-22 09:52:18 -0500 (Fri, 22 Jun 2007) | 4 lines
Fix a few silly usages of ast_playstream() - it only ever returns 0...
Issue 10035
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@71069 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/file.c')
| -rw-r--r-- | main/file.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/main/file.c b/main/file.c index 3c809e9c0..699df5aa9 100644 --- a/main/file.c +++ b/main/file.c @@ -794,10 +794,9 @@ int ast_streamfile(struct ast_channel *chan, const char *filename, const char *p return -1; if (vfs && ast_applystream(chan, vfs)) return -1; - if (ast_playstream(fs)) - return -1; - if (vfs && ast_playstream(vfs)) - return -1; + ast_playstream(fs); + if (vfs) + ast_playstream(vfs); if (option_verbose > 2) ast_verbose(VERBOSE_PREFIX_3 "<%s> Playing '%s.%s' (language '%s')\n", chan->name, filename, ast_getformatname(chan->writeformat), preflang ? preflang : "default"); |