[asterisk-commits] mnicholson: trunk r258675 - /trunk/main/channel.c

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Thu Apr 22 17:11:23 2010
New Revision: 258675

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=258675
Log:
Fix previous commit.

Modified:
    trunk/main/channel.c

Modified: trunk/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/channel.c?view=diff&rev=258675&r1=258674&r2=258675
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Thu Apr 22 17:11:23 2010
@@ -4522,8 +4522,19 @@
 					break;
 
 				case AST_CONTROL_BUSY:
+					ast_cdr_busy(chan->cdr);
+					*outstate = f->subclass.integer;
+					timeout = 0;
+					break;
+
 				case AST_CONTROL_CONGESTION:
+					ast_cdr_failed(chan->cdr);
+					*outstate = f->subclass.integer;
+					timeout = 0;
+					break;
+
 				case AST_CONTROL_ANSWER:
+					ast_cdr_answer(chan->cdr);
 					*outstate = f->subclass.integer;
 					timeout = 0;		/* trick to force exit from the while() */
 					break;
@@ -6140,24 +6151,6 @@
 
 				ast_clear_flag(c0, AST_FLAG_NBRIDGE);
 				ast_clear_flag(c1, AST_FLAG_NBRIDGE);
-
-				case AST_CONTROL_BUSY:
-					ast_cdr_busy(chan->cdr);
-					*outstate = f->subclass;
-					timeout = 0;
-					break;
-
-				case AST_CONTROL_CONGESTION:
-					ast_cdr_failed(chan->cdr);
-					*outstate = f->subclass;
-					timeout = 0;
-					break;
-
-				case AST_CONTROL_ANSWER:
-					ast_cdr_answer(chan->cdr);
-					*outstate = f->subclass;
-					timeout = 0;		/* trick to force exit from the while() */
-					break;
 
 				if (c0->_softhangup == AST_SOFTHANGUP_UNBRIDGE || c1->_softhangup == AST_SOFTHANGUP_UNBRIDGE)
 					continue;