From b7ad6d8c2d75e377b249c73ab58ff50330bc589c Mon Sep 17 00:00:00 2001 From: Automerge script Date: Mon, 27 Feb 2006 03:04:02 +0000 Subject: [PATCH] automerge commit git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@11275 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channel.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/channel.c b/channel.c index 5aacefd21f..011bdaef3e 100644 --- a/channel.c +++ b/channel.c @@ -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 */