[svn-commits] russell: branch 1.8 r281568 - in /branches/1.8: ./ apps/app_dial.c

[SVN commits to the Digium repositories]

Author: russell
Date: Tue Aug 10 12:48:42 2010
New Revision: 281568

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=281568
Log:
Merged revisions 281567 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r281567 | russell | 2010-08-10 12:47:13 -0500 (Tue, 10 Aug 2010) | 15 lines
  
  Merged revisions 281566 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r281566 | russell | 2010-08-10 12:45:45 -0500 (Tue, 10 Aug 2010) | 8 lines
    
    Reset visible indication after answer.
    
    (closes issue #17641)
    Reported by: klaus3000
    Patches:
          ast1.6.2.9-app_dial-visible_indication.patch.txt uploaded by klaus3000 (license 65)
    Tested by: schmidts
  ........
................

Modified:
    branches/1.8/   (props changed)
    branches/1.8/apps/app_dial.c

Propchange: branches/1.8/
------------------------------------------------------------------------------
--- branch-1.6.2-merged (original)
+++ branch-1.6.2-merged Tue Aug 10 12:48:42 2010
@@ -1,1 +1,1 @@
-/branches/1.6.2:1-279056,279207,279501,279561,279597,279609,279657,279784,279849,279946,280089,280160,280193,280229,280231,280306,280345,280449,280551,280671,280739,280983,281051,281391,281430
+/branches/1.6.2:1-279056,279207,279501,279561,279597,279609,279657,279784,279849,279946,280089,280160,280193,280229,280231,280306,280345,280449,280551,280671,280739,280983,281051,281391,281430,281567

Modified: branches/1.8/apps/app_dial.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/apps/app_dial.c?view=diff&rev=281568&r1=281567&r2=281568
==============================================================================
--- branches/1.8/apps/app_dial.c (original)
+++ branches/1.8/apps/app_dial.c Tue Aug 10 12:48:42 2010
@@ -2611,8 +2611,9 @@
 				sentringing = 0;
 				ast_indicate(chan, -1);
 			}
-			/* Be sure no generators are left on it */
+			/* Be sure no generators are left on it and reset the visible indication */
 			ast_deactivate_generator(chan);
+			chan->visible_indication = 0;
 			/* Make sure channels are compatible */
 			res = ast_channel_make_compatible(chan, peer);
 			if (res < 0) {