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
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@315002 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 26a2d010035c0b3cc922846f047f6ac343ccd028..c09d3965432218efbcdff0f40598da7f51d042b8 100644 (file)
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -13513,6 +13513,7 @@ static struct ast_channel *dahdi_request(const char *type, struct ast_format_cap
                                }
                        }
 
+                       p->distinctivering = 0;
                        /* Make special notes */
                        switch (start.opt) {
                        case '\0':