[svn-commits] alecdavis: trunk r315002 - in /trunk: ./ channels/chan_dahdi.c

[SVN commits to the Digium repositories]

Author: alecdavis
Date: Fri Apr 22 18:01:38 2011
New Revision: 315002

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

........
  r315001 | alecdavis | 2011-04-23 10:59:18 +1200 (Sat, 23 Apr 2011) | 12 lines
  
  chan_dahdi: Can't return to normal ring after distinctive ring on FXS 
  
  clear a previous distinctivering pattern before each new call
  
  (closes issue #18985)
  Reported by: bromont
  Patches: 
        bug18985.diff.txt uploaded by alecdavis (license 585)
  Tested by: alecdavis, bromont
........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_dahdi.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_dahdi.c?view=diff&rev=315002&r1=315001&r2=315002
==============================================================================
--- trunk/channels/chan_dahdi.c (original)
+++ trunk/channels/chan_dahdi.c Fri Apr 22 18:01:38 2011
@@ -13513,6 +13513,7 @@
 				}
 			}
 
+			p->distinctivering = 0;
 			/* Make special notes */
 			switch (start.opt) {
 			case '\0':