From: Joshua Colp <jcolp@digium.com>
Date: Mon, 28 May 2007 23:16:56 +0000 (+0000)
Subject: Make the usedistinctiveringdetection option work again. (issue #9823 reported by... 
X-Git-Tag: 1.4.5~113
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3a5a6494152037207ac7b9357e69b4f5be6e9491;p=thirdparty%2Fasterisk.git

Make the usedistinctiveringdetection option work again. (issue #9823 reported by premeau)


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

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index c9ffd9e2ed..ea02e99a9a 100644
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -206,7 +206,6 @@ static char defaultozz[64] = "";
 
 static char progzone[10] = "";
 
-static int usedistinctiveringdetection = 0;
 static int distinctiveringaftercid = 0;
 
 static int numbufs = 4;
@@ -7376,7 +7375,7 @@ static struct zt_pvt *mkintf(int channel, struct zt_chan_conf conf, struct zt_pr
 		/* Flag to destroy the channel must be cleared on new mkif.  Part of changes for reload to work */
 		tmp->destroy = 0;
 		tmp->drings = drings;
-		tmp->usedistinctiveringdetection = usedistinctiveringdetection;
+		tmp->usedistinctiveringdetection = conf.chan.usedistinctiveringdetection;
 		tmp->callwaitingcallerid = conf.chan.callwaitingcallerid;
 		tmp->threewaycalling = conf.chan.threewaycalling;
 		tmp->adsi = conf.chan.adsi;