aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2009-01-23 20:20:38 +0000
committerfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2009-01-23 20:20:38 +0000
commit5c4f69993935a3c51f135510363886f91f8457bf (patch)
tree738bf282d17f3563ec8ba255dab8025e9f92f6a8 /main
parent7842e629c5335fb1419a33ae2f8ed09126f5080f (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.1@170664 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 b91086e42..1f97e44e0 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -1742,6 +1742,7 @@ int __ast_answer(struct ast_channel *chan, unsigned int delay)
break;
}
+ ast_indicate(chan, -1);
chan->visible_indication = 0;
return res;