kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@25486 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-05-08 12:06:46 +00:00
parent 151fc69ffc
commit d4b1647374
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/res_features.c
View File

@@ -742,7 +742,7 @@ static int builtin_atxfer(struct ast_channel *chan, struct ast_channel *peer, st
}
if (!ast_strlen_zero(xfersound) && !ast_streamfile(transferer, xfersound, transferer->language)) {
if (ast_waitstream(transferer, "") < 0) {
ast_log(LOG_WARNING, "Failed to play courtesy tone!\n");
ast_log(LOG_WARNING, "Failed to play transfer sound!\n");
}
}
ast_moh_stop(transferee);
@@ -806,7 +806,7 @@ static int builtin_atxfer(struct ast_channel *chan, struct ast_channel *peer, st
if (!ast_strlen_zero(xfersound) && !ast_streamfile(newchan, xfersound, newchan->language)) {
if (ast_waitstream(newchan, "") < 0) {
ast_log(LOG_WARNING, "Failed to play courtesy tone!\n");
ast_log(LOG_WARNING, "Failed to play transfer sound!\n");
}
}
ast_bridge_call_thread_launch(tobj);