diff options
author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-02-27 03:04:02 +0000 |
---|---|---|
committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-02-27 03:04:02 +0000 |
commit | 082031115e1d6e5708c94a4de6761c1bd8c5e75a (patch) | |
tree | c92e9ffa37bb71b8b6777623f2d099fc27592e39 /channel.c | |
parent | 0d6770e310acc6e51a35890accdc524bd4df8197 (diff) |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@11275 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channel.c')
-rw-r--r-- | channel.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -2392,7 +2392,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 */ |