]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 189010 via svnmerge from
authorMatthew Nicholson <mnicholson@digium.com>
Fri, 17 Apr 2009 17:33:27 +0000 (17:33 +0000)
committerMatthew Nicholson <mnicholson@digium.com>
Fri, 17 Apr 2009 17:33:27 +0000 (17:33 +0000)
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
  ........
................

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

main/pbx.c

index 59e4a3697ed8eb9452109c1752cd8089d7e31488..99fd4789900803b8ffa89c3cb9d097b76f66a914 100644 (file)
@@ -7859,8 +7859,10 @@ static int pbx_builtin_busy(struct ast_channel *chan, void *data)
        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;
 }