]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 170648 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Fri, 23 Jan 2009 20:18:05 +0000 (20:18 +0000)
committerJoshua Colp <jcolp@digium.com>
Fri, 23 Jan 2009 20:18:05 +0000 (20:18 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r170648 | file | 2009-01-23 16:16:39 -0400 (Fri, 23 Jan 2009) | 4 lines

  When a channel is answered make sure any indications currently playing stop. Usually the phone would do this but if the channel was already answered then they are being generated by Asterisk and we darn well need to stop them.
  (closes issue #14249)
  Reported by: RadicAlish
........

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

main/channel.c

index d22249e9951b63e61a087e5582b7ba80dfd5d0df..eff973586ed5ecc0fc50eb19d3d8b692176de60b 100644 (file)
@@ -1759,6 +1759,7 @@ int __ast_answer(struct ast_channel *chan, unsigned int delay)
                break;
        }
 
+       ast_indicate(chan, -1);
        chan->visible_indication = 0;
 
        return res;