aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2009-01-23 20:19:37 +0000
committerfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2009-01-23 20:19:37 +0000
commitc406a1cd078184c1ac80c114c1f15c2b3ce557c1 (patch)
treeb21ece593bf676e0b4e4c59ee0a11f463f3bd264 /main
parentf4d5d2e9166f7d602a4f8cec45fc35eb2f6fc03f (diff)
Merged revisions 170652 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r170652 | file | 2009-01-23 16:18:05 -0400 (Fri, 23 Jan 2009) | 11 lines Merged revisions 170648 via svnmerge from 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: http://svn.digium.com/svn/asterisk/branches/1.6.0@170659 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r--main/channel.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/main/channel.c b/main/channel.c
index 41a62aeb7..d0c5ff05f 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -1757,6 +1757,7 @@ int __ast_answer(struct ast_channel *chan, unsigned int delay)
break;
}
+ ast_indicate(chan, -1);
chan->visible_indication = 0;
return res;