automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@11275 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channel.c b/channel.c
index 5aacefd21fbc1f6d7d68460c0a0fd8f901d00f91..011bdaef3e6dfb34039a4f5d82009f5726d56377 100644 (file)
--- 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 */