mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-03 12:25:35 +00:00
automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@69941 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -1296,6 +1296,10 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
|
||||
}
|
||||
}
|
||||
|
||||
/* If the channel wants to be hung up, hang it up */
|
||||
if (ast_check_hangup(chan))
|
||||
break;
|
||||
|
||||
if (c) {
|
||||
if (c->fds[0] != origfd) {
|
||||
if (using_pseudo) {
|
||||
|
||||
Reference in New Issue
Block a user