[asterisk-commits] trunk r11251 - in /trunk: ./ channel.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Sun Feb 26 20:51:03 2006
New Revision: 11251

URL: http://svn.digium.com/view/asterisk?rev=11251&view=rev
Log:
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)

........

Modified:
    trunk/   (props changed)
    trunk/channel.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: trunk/channel.c
URL: http://svn.digium.com/view/asterisk/trunk/channel.c?rev=11251&r1=11250&r2=11251&view=diff
==============================================================================
--- trunk/channel.c (original)
+++ trunk/channel.c Sun Feb 26 20:51:03 2006
@@ -2437,7 +2437,8 @@
 		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 */