[svn-commits] branch 1.2 r11250 - /branches/1.2/channel.c

[svn-commits at lists.digium.com]

Author: russell
Date: Sun Feb 26 20:50:09 2006
New Revision: 11250

URL: http://svn.digium.com/view/asterisk?rev=11250&view=rev
Log:
don't hang up the channel if its state is set to UP before we return from ast_call (issue #6569)

Modified:
    branches/1.2/channel.c

Modified: branches/1.2/channel.c
URL: http://svn.digium.com/view/asterisk/branches/1.2/channel.c?rev=11250&r1=11249&r2=11250&view=diff
==============================================================================
--- branches/1.2/channel.c (original)
+++ branches/1.2/channel.c Sun Feb 26 20:50:09 2006
@@ -2392,7 +2392,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 */