diff options
author | automerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-06-22 15:27:54 +0000 |
---|---|---|
committer | automerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-06-22 15:27:54 +0000 |
commit | 85a2abbbbfafd2400b5bb3331a2882721caa6ece (patch) | |
tree | 9bb95392065c3ae08c273654d351c610c8a8624a /file.c | |
parent | 90b56f7d3870e4de219a42e609f9ca9776788582 (diff) |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@71119 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'file.c')
-rw-r--r-- | file.c | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -816,10 +816,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 1 if (option_verbose > 2) ast_verbose(VERBOSE_PREFIX_3 "Playing '%s' (language '%s')\n", filename, preflang ? preflang : "default"); |