diff options
author | Richard Mudgett <rmudgett@digium.com> | 2013-01-22 00:36:52 +0000 |
---|---|---|
committer | Richard Mudgett <rmudgett@digium.com> | 2013-01-22 00:36:52 +0000 |
commit | 09fb47a65ca60476d1587a9f3ec5d80d4a4db441 (patch) | |
tree | 5847020b089d9251cfbec95d311afab16bd3ad7d /channels/chan_bridge.c | |
parent | a3e7a77a82b9162a25d5d44e6bd51d13e65de4ed (diff) |
confbridge: Minor fixes playing user counts to the conference.
* Generate a warning message if sound files do not exist when trying to
play the user count to the conference. Use the new helper routine
sound_file_exists() for consistency.
* Put the new user into autoservice when playing user counts to the
conference.
* Check the return value of ast_bridge_impart().
........
Merged revisions 379808 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@379809 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_bridge.c')
-rw-r--r-- | channels/chan_bridge.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/channels/chan_bridge.c b/channels/chan_bridge.c index 1670cba65..8eac76a82 100644 --- a/channels/chan_bridge.c +++ b/channels/chan_bridge.c @@ -126,9 +126,8 @@ static int bridge_call(struct ast_channel *ast, const char *dest, int timeout) } /* Impart the output channel upon the given bridge of the input channel */ - ast_bridge_impart(ast_channel_internal_bridge(p->input), p->output, NULL, NULL, 0); - - return 0; + return ast_bridge_impart(ast_channel_internal_bridge(p->input), p->output, NULL, NULL, 0) + ? -1 : 0; } /*! \brief Called when a channel should be hung up */ |