diff options
| author | Russell Bryant <russell@russellbryant.com> | 2006-02-27 02:51:03 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2006-02-27 02:51:03 +0000 |
| commit | 1323c7be914397e672d28cb61f287238dec6a4ef (patch) | |
| tree | 30cd34ea7be33afc01ddca2521255c39d8be3eb4 /channel.c | |
| parent | 442785f3e220b309e1cfe8bf65dc0541c28340af (diff) | |
Merged revisions 11250 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r11250 | russell | 2006-02-26 21:50:09 -0500 (Sun, 26 Feb 2006) | 2 lines
don't hang up the channel if its state is set to UP before we return from ast_call (issue #6569)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@11251 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channel.c')
| -rw-r--r-- | channel.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -2437,7 +2437,8 @@ struct ast_channel *__ast_request_and_dial(const char *type, int format, void *d ast_set_callerid(chan, cid_num, cid_name, cid_num); if (!ast_call(chan, data, 0)) { - while(timeout && (chan->_state != AST_STATE_UP)) { + res = 1; /* in case chan->_state is already AST_STATE_UP */ + while (timeout && (chan->_state != AST_STATE_UP)) { res = ast_waitfor(chan, timeout); if (res < 0) { /* Something not cool, or timed out */ |