[asterisk-commits] mnicholson: branch 1.6.0 r189070 - in /branches/1.6.0: ./ main/pbx.c

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Fri Apr 17 12:33:36 2009
New Revision: 189070

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=189070
Log:
Merged revisions 189010 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r189010 | mnicholson | 2009-04-17 10:44:18 -0500 (Fri, 17 Apr 2009) | 12 lines
  
  Merged revisions 189009 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r189009 | mnicholson | 2009-04-17 10:43:09 -0500 (Fri, 17 Apr 2009) | 5 lines
    
    Make Busy() application set the CDR disposition to BUSY.
    
    (closes issue #14306)
    Reported by: cristiandimache
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/pbx.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/pbx.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/main/pbx.c?view=diff&rev=189070&r1=189069&r2=189070
==============================================================================
--- branches/1.6.0/main/pbx.c (original)
+++ branches/1.6.0/main/pbx.c Fri Apr 17 12:33:36 2009
@@ -7601,8 +7601,10 @@
 	ast_indicate(chan, AST_CONTROL_BUSY);
 	/* Don't change state of an UP channel, just indicate
 	   busy in audio */
-	if (chan->_state != AST_STATE_UP)
+	if (chan->_state != AST_STATE_UP) {
 		ast_setstate(chan, AST_STATE_BUSY);
+		ast_cdr_busy(chan->cdr);
+	}
 	wait_for_hangup(chan, data);
 	return -1;
 }