diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-08-10 18:37:32 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-08-10 18:37:32 +0000 |
| commit | cb993f31ecc7034b80f8d67f655dec6684fc658c (patch) | |
| tree | af5115717336b27b56cd1dcf25c8027666c45975 /main | |
| parent | 43577177e74a3bf5a44c4f434b1ea71476757716 (diff) | |
Bring up to date with poll changes.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@79074 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/dial.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/main/dial.c b/main/dial.c index 466d6c694..3d4d3d739 100644 --- a/main/dial.c +++ b/main/dial.c @@ -289,6 +289,8 @@ static int begin_dial_channel(struct ast_dial_channel *channel, struct ast_chann ast_hangup(channel->owner); channel->owner = NULL; } else { + if (chan) + ast_poll_channel_add(chan, channel->owner); res = 1; ast_verb(3, "Called %s\n", numsubst); } @@ -595,6 +597,8 @@ static enum ast_dial_result monitor_dial(struct ast_dial *dial, struct ast_chann set_state(dial, AST_DIAL_RESULT_HANGUP); break; } + if (chan) + ast_poll_channel_del(chan, channel->owner); ast_hangup(who); channel->owner = NULL; continue; @@ -616,6 +620,8 @@ static enum ast_dial_result monitor_dial(struct ast_dial *dial, struct ast_chann AST_LIST_TRAVERSE(&dial->channels, channel, list) { if (!channel->owner || channel->owner == who) continue; + if (chan) + ast_poll_channel_del(chan, channel->owner); ast_hangup(channel->owner); channel->owner = NULL; } @@ -632,6 +638,8 @@ static enum ast_dial_result monitor_dial(struct ast_dial *dial, struct ast_chann AST_LIST_TRAVERSE(&dial->channels, channel, list) { if (!channel->owner) continue; + if (chan) + ast_poll_channel_del(chan, channel->owner); ast_hangup(channel->owner); channel->owner = NULL; } |