[asterisk-commits] file: branch 1.6.1 r170664 - in /branches/1.6.1: ./ main/channel.c

[SVN commits to the Asterisk project]

Author: file
Date: Fri Jan 23 14:20:38 2009
New Revision: 170664

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=170664
Log:
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
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/channel.c

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

Modified: branches/1.6.1/main/channel.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/main/channel.c?view=diff&rev=170664&r1=170663&r2=170664
==============================================================================
--- branches/1.6.1/main/channel.c (original)
+++ branches/1.6.1/main/channel.c Fri Jan 23 14:20:38 2009
@@ -1742,6 +1742,7 @@
 		break;
 	}
 
+	ast_indicate(chan, -1);
 	chan->visible_indication = 0;
 
 	return res;